gh-118074: Immortal executors are not GC-able (#118182)

gvanrossum · web-flow · commit 7e87d30f1f30 · 2024-04-23T13:38:23.000-07:00
Better version of gh-118117. Just check for immortality instead of an address range check.
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -397,10 +397,7 @@ executor_traverse(PyObject *o, visitproc visit, void *arg)
 static int
 executor_is_gc(PyObject *o)
 {
-    if ((PyObject *)&COLD_EXITS[0] <= o && o < (PyObject *)&COLD_EXITS[COLD_EXIT_COUNT]) {
-        return 0;
-    }
-    return 1;
+    return !_Py_IsImmortal(o);
 }
 
 PyTypeObject _PyUOpExecutor_Type = {

Original file line number	Diff line number	Diff line change
`@@ -397,10 +397,7 @@ executor_traverse(PyObject o, visitproc visit, void arg)`
`397`	`397`	`static int`
`398`	`398`	`executor_is_gc(PyObject *o)`
`399`	`399`	`{`
`400`		`- if ((PyObject )&COLD_EXITS[0] <= o && o < (PyObject )&COLD_EXITS[COLD_EXIT_COUNT]) {`
`401`		`- return 0;`
`402`		`- }`
`403`		`- return 1;`
	`400`	`+ return !_Py_IsImmortal(o);`
`404`	`401`	`}`
`405`	`402`
`406`	`403`	`PyTypeObject _PyUOpExecutor_Type = {`