Don't count executing generators and coroutines as referrers in gc.get_referrers.

Author: markshannon

Lib/test/test_asyncio/test_streams.py

@@ -1214,9 +1214,8 @@ async def main():
                 # can't use assertRaises because that clears frames
                 exc = excs.exceptions[0]
             self.assertIsNotNone(exc)
-            self.assertListEqual(gc.get_referrers(exc), [main_coro])
-        main_coro = main()
-        asyncio.run(main_coro)
+            self.assertListEqual(gc.get_referrers(exc), [])
+        asyncio.run(main())
 
 
 if __name__ == '__main__':

Lib/test/test_asyncio/test_taskgroups.py

@@ -29,15 +29,6 @@ def get_error_types(eg):
     return {type(exc) for exc in eg.exceptions}
 
 
-def no_other_refs():
-    # due to gh-124392 coroutines now refer to their locals
-    coro = asyncio.current_task().get_coro()
-    frame = sys._getframe(1)
-    while coro.cr_frame != frame:
-        coro = coro.cr_await
-    return [coro]
-
-
 class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
 
     async def test_taskgroup_01(self):
@@ -923,7 +914,7 @@ class _Done(Exception):
             exc = e
 
         self.assertIsNotNone(exc)
-        self.assertListEqual(gc.get_referrers(exc), no_other_refs())
+        self.assertListEqual(gc.get_referrers(exc), [])
 
 
     async def test_exception_refcycles_errors(self):
@@ -941,7 +932,7 @@ class _Done(Exception):
             exc = excs.exceptions[0]
 
         self.assertIsInstance(exc, _Done)
-        self.assertListEqual(gc.get_referrers(exc), no_other_refs())
+        self.assertListEqual(gc.get_referrers(exc), [])
 
 
     async def test_exception_refcycles_parent_task(self):
@@ -963,7 +954,7 @@ async def coro_fn():
             exc = excs.exceptions[0].exceptions[0]
 
         self.assertIsInstance(exc, _Done)
-        self.assertListEqual(gc.get_referrers(exc), no_other_refs())
+        self.assertListEqual(gc.get_referrers(exc), [])
 
     async def test_exception_refcycles_propagate_cancellation_error(self):
         """Test that TaskGroup deletes propagate_cancellation_error"""
@@ -978,7 +969,7 @@ async def test_exception_refcycles_propagate_cancellation_error(self):
             exc = e.__cause__
 
         self.assertIsInstance(exc, asyncio.CancelledError)
-        self.assertListEqual(gc.get_referrers(exc), no_other_refs())
+        self.assertListEqual(gc.get_referrers(exc), [])
 
     async def test_exception_refcycles_base_error(self):
         """Test that TaskGroup deletes self._base_error"""
@@ -995,7 +986,7 @@ class MyKeyboardInterrupt(KeyboardInterrupt):
             exc = e
 
         self.assertIsNotNone(exc)
-        self.assertListEqual(gc.get_referrers(exc), no_other_refs())
+        self.assertListEqual(gc.get_referrers(exc), [])
 
 
 if __name__ == "__main__":

Objects/genobject.c

@@ -58,7 +58,7 @@ gen_traverse(PyObject *self, visitproc visit, void *arg)
     PyGenObject *gen = _PyGen_CAST(self);
     Py_VISIT(gen->gi_name);
     Py_VISIT(gen->gi_qualname);
-    if (gen->gi_frame_state != FRAME_CLEARED) {
+    if (gen->gi_frame_state < FRAME_EXECUTING) {
         _PyInterpreterFrame *frame = &gen->gi_iframe;
         assert(frame->frame_obj == NULL ||
                frame->frame_obj->f_frame->owner == FRAME_OWNED_BY_GENERATOR);
@@ -375,6 +375,7 @@ gen_close(PyObject *self, PyObject *args)
 
     if (gen->gi_frame_state == FRAME_CREATED) {
         gen->gi_frame_state = FRAME_COMPLETED;
+        _PyFrame_ClearLocals(&gen->gi_iframe);
         Py_RETURN_NONE;
     }
     if (FRAME_STATE_FINISHED(gen->gi_frame_state)) {