pythongh-116604: Check for gcstate->enabled in _Py_RunGC in free-threaded build (python#116663)

colesbury · web-flow · commit 5d72b7538899 · 2024-03-12T17:12:02.000Z
This isn't strictly necessary because the implementation of `gc_should_collect`
already checks `gcstate-&gt;enabled` in the free-threaded build, but it seems
like a good idea until the common pieces of gc.c and gc_free_threading.c are
refactored out.
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
@@ -1603,6 +1603,10 @@ _PyObject_GC_Link(PyObject *op)
 void
 _Py_RunGC(PyThreadState *tstate)
 {
+    GCState *gcstate = get_gc_state();
+    if (!gcstate->enabled) {
+        return;
+    }
     gc_collect_main(tstate, 0, _Py_GC_REASON_HEAP);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1603,6 +1603,10 @@ _PyObject_GC_Link(PyObject *op)`
`1603`	`1603`	`void`
`1604`	`1604`	`_Py_RunGC(PyThreadState *tstate)`
`1605`	`1605`	`{`
	`1606`	`+ GCState *gcstate = get_gc_state();`
	`1607`	`+ if (!gcstate->enabled) {`
	`1608`	`+ return;`
	`1609`	`+ }`
`1606`	`1610`	`gc_collect_main(tstate, 0, _Py_GC_REASON_HEAP);`
`1607`	`1611`	`}`
`1608`	`1612`