pythongh-113753: Clear finalized bit when allocating PyAsyncGenASend …

…from free-list
colesbury · Jan 5, 2024 · 7ae71e9 · 7ae71e9
1 parent 99854ce
commit 7ae71e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Include/internal/pycore_gc.h b/Include/internal/pycore_gc.h
@@ -120,6 +120,10 @@ static inline void _PyGC_SET_FINALIZED(PyObject *op) {
     PyGC_Head *gc = _Py_AS_GC(op);
     _PyGCHead_SET_FINALIZED(gc);
 }
+static inline void _PyGC_CLEAR_FINALIZED(PyObject *op) {
+    PyGC_Head *gc = _Py_AS_GC(op);
+    gc->_gc_prev &= ~_PyGC_PREV_MASK_FINALIZED;
+}
 
 
 /* GC runtime state */

diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -6,6 +6,7 @@
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_ceval.h"         // _PyEval_EvalFrame()
 #include "pycore_frame.h"         // _PyInterpreterFrame
+#include "pycore_gc.h"            // _PyGC_CLEAR_FINALIZED()
 #include "pycore_genobject.h"     // struct _Py_async_gen_state
 #include "pycore_modsupport.h"    // _PyArg_CheckPositional()
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
@@ -1913,6 +1914,7 @@ async_gen_asend_new(PyAsyncGenObject *gen, PyObject *sendval)
     if (state->asend_numfree) {
         state->asend_numfree--;
         o = state->asend_freelist[state->asend_numfree];
+        _PyGC_CLEAR_FINALIZED((PyObject *)o);
         _Py_NewReference((PyObject *)o);
     }
     else