From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:10:12 +0000 (+0100)
Subject: [3.11] gh-111777: Fix assertion errors on incorrectly still-tracked GC object destruc... 
X-Git-Tag: v3.11.8~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67424458d23428d524e7c08e1556d7687297dbaa;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-111777: Fix assertion errors on incorrectly still-tracked GC object destruction (GH-111778) (GH-111990)

In PyObject_GC_Del, in Py_DEBUG mode, when warning about GC objects that
were not properly untracked before starting destruction, take care to
untrack the object _before_ warning, to avoid triggering a GC run and
causing the problem the code tries to warn about. Also make sure to save and
restore any pending exceptions, which the warning would otherwise clobber or
trigger an assertion error on.
(cherry picked from commit ce6a533c4bf1afa3775dfcaee5fc7d5c15a4af8c)

Co-authored-by: T. Wouters <thomas@python.org>
---

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index dcd46feff0cc..347ded80b7c1 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -2347,14 +2347,18 @@ PyObject_GC_Del(void *op)
     size_t presize = _PyType_PreHeaderSize(((PyObject *)op)->ob_type);
     PyGC_Head *g = AS_GC(op);
     if (_PyObject_GC_IS_TRACKED(op)) {
+        gc_list_remove(g);
 #ifdef Py_DEBUG
+        PyObject *exc, *exc_value, *exc_tb;
+        PyErr_Fetch(&exc, &exc_value, &exc_tb);
         if (PyErr_WarnExplicitFormat(PyExc_ResourceWarning, "gc", 0,
                                      "gc", NULL, "Object of type %s is not untracked before destruction",
                                      ((PyObject*)op)->ob_type->tp_name)) {
             PyErr_WriteUnraisable(NULL);
         }
+        if (exc != NULL)
+            PyErr_Restore(exc, exc_value, exc_tb);
 #endif
-        gc_list_remove(g);
     }
     GCState *gcstate = get_gc_state();
     if (gcstate->generations[0].count > 0) {