Add _PyThreadState_PopCStackRefSteal as suggested by Sam

Author: markshannon

Include/internal/pycore_stackref.h

@@ -827,6 +827,17 @@ _PyThreadState_PopCStackRef(PyThreadState *tstate, _PyCStackRef *ref)
     PyStackRef_XCLOSE(ref->ref);
 }
 
+static inline _PyStackRef
+_PyThreadState_PopCStackRefSteal(PyThreadState *tstate, _PyCStackRef *ref)
+{
+#ifdef Py_GIL_DISABLED
+    _PyThreadStateImpl *tstate_impl = (_PyThreadStateImpl *)tstate;
+    assert(tstate_impl->c_stack_refs == ref);
+    tstate_impl->c_stack_refs = ref->next;
+#endif
+    return ref->ref;
+}
+
 #ifdef Py_GIL_DISABLED
 
 static inline int

Python/bytecodes.c

@@ -2339,11 +2339,7 @@ dummy_func(
                     assert(!PyStackRef_IsNull(method.ref));  // No errors on this branch
                     self_or_null[0] = owner;  // Transfer ownership
                     DEAD(owner);
-                    attr = method.ref;
-            #ifdef Py_GIL_DISABLED
-                    method.ref = PyStackRef_NULL;
-                    _PyThreadState_PopCStackRef(tstate, &method);
-            #endif
+                    attr = _PyThreadState_PopCStackRefSteal(tstate, &method);
                 }
                 else {
                     /* meth is not an unbound method (but a regular attr, or
@@ -2354,11 +2350,7 @@ dummy_func(
                     */
                     PyStackRef_CLOSE(owner);
                     self_or_null[0] = PyStackRef_NULL;
-                    attr = method.ref;
-            #ifdef Py_GIL_DISABLED
-                    method.ref = PyStackRef_NULL;
-                    _PyThreadState_PopCStackRef(tstate, &method);
-            #endif
+                    attr = _PyThreadState_PopCStackRefSteal(tstate, &method);
                     ERROR_IF(PyStackRef_IsNull(attr));
                 }
             }

Python/executor_cases.c.h

@@ -697,6 +697,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "PyStackRef_Wrap",
     "PyStackRef_Unwrap",
     "_PyLong_CheckExactAndCompact",
+    "_PyThreadState_PopCStackRefSteal",
 )