[3.13] gh-151524: Make it clearer that _PyInstrumentation_DISABLE is immortal in the code (GH-151525) (GH-155351)

miss-islington · lpyu001 · web-flow · commit 2e19855a1734 · 2026-08-07T15:52:49.000Z
(cherry picked from commit 52bed26) Co-authored-by: stevens <lipengyu@kylinos.cn>
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -960,8 +960,12 @@ call_one_instrument(
     if (res == NULL) {
         return -1;
     }
+    if (res == &_PyInstrumentation_DISABLE) {
+        assert(_Py_IsImmortal(res));
+        return 1;
+    }
     Py_DECREF(res);
-    return (res == &_PyInstrumentation_DISABLE);
+    return 0;
 }
 
 static const int8_t MOST_SIGNIFICANT_BITS[16] = {

Original file line number	Diff line number	Diff line change
`@@ -960,8 +960,12 @@ call_one_instrument(`
`960`	`960`	`if (res == NULL) {`
`961`	`961`	`return -1;`
`962`	`962`	`}`
	`963`	`+ if (res == &_PyInstrumentation_DISABLE) {`
	`964`	`+ assert(_Py_IsImmortal(res));`
	`965`	`+ return 1;`
	`966`	`+ }`
`963`	`967`	`Py_DECREF(res);`
`964`		`- return (res == &_PyInstrumentation_DISABLE);`
	`968`	`+ return 0;`
`965`	`969`	`}`
`966`	`970`
`967`	`971`	`static const int8_t MOST_SIGNIFICANT_BITS[16] = {`