[3.14] gh-137007: Track executor before any possible deallocations (GH-137016) (GH...

gh-137007: Track executor before any possible deallocations (GH-137016)
(cherry picked from commit 97e19014ddc652beae58e7eceb591f5d65a875e6)

Co-authored-by: Ken Jin <kenjin@python.org>

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-07-22-16-20-06.gh-issue-137007.1oPvvK.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-22-16-20-06.gh-issue-137007.1oPvvK.rst
new file mode 100644 (file)
index 0000000..cb25fd1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-22-16-20-06.gh-issue-137007.1oPvvK.rst
@@ -0,0 +1 @@
+Fix a bug during JIT compilation failure which caused garbage collection debug assertions to fail.

diff --git a/Python/optimizer.c b/Python/optimizer.c
index 6679eecd648a85ca95d34363dc30e506bfa6308a..3a66aeb4f827b368deffa6432793b9bb25fdd4cd 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -1213,6 +1213,10 @@ make_executor_from_uops(_PyUOpInstruction *buffer, int length, const _PyBloomFil
     assert(next_exit == -1);
     assert(dest == executor->trace);
     assert(dest->opcode == _START_EXECUTOR);
+    // Note: we MUST track it here before any Py_DECREF(executor) or
+    // linking of executor. Otherwise, the GC tries to untrack a
+    // still untracked object during dealloc.
+    _PyObject_GC_TRACK(executor);
     _Py_ExecutorInit(executor, dependencies);
 #ifdef Py_DEBUG
     char *python_lltrace = Py_GETENV("PYTHON_LLTRACE");
@@ -1242,7 +1246,6 @@ make_executor_from_uops(_PyUOpInstruction *buffer, int length, const _PyBloomFil
         return NULL;
     }
 #endif
-    _PyObject_GC_TRACK(executor);
     return executor;
 }