Revert "[3.12] pythongh-118272: Clear generator frame's locals when the generator is closed (python#118451)"

This reverts commit 238efbe.

Author: iritkatriel

Include/internal/pycore_frame.h

@@ -213,9 +213,6 @@ _PyFrame_GetFrameObject(_PyInterpreterFrame *frame)
     return _PyFrame_MakeAndSetFrameObject(frame);
 }
 
-void
-_PyFrame_ClearLocals(_PyInterpreterFrame *frame);
-
 /* Clears all references in the frame.
  * If take is non-zero, then the _PyInterpreterFrame frame
  * may be transferred to the frame object it references

Lib/test/test_generators.py

@@ -450,26 +450,6 @@ def g():
         self.assertIsInstance(cm.exception.value, StopIteration)
         self.assertEqual(cm.exception.value.value, 2)
 
-    def test_close_releases_frame_locals(self):
-        # See gh-118272
-
-        class Foo:
-            pass
-
-        f = Foo()
-        f_wr = weakref.ref(f)
-
-        def genfn():
-            a = f
-            yield
-
-        g = genfn()
-        next(g)
-        del f
-        g.close()
-        support.gc_collect()
-        self.assertIsNone(f_wr())
-
 
 class GeneratorThrowTest(unittest.TestCase):
 

Objects/genobject.c

@@ -403,7 +403,6 @@ gen_close(PyGenObject *gen, PyObject *args)
          * StopIteration. */
         if (exception_handler_depth == 1) {
             gen->gi_frame_state = FRAME_COMPLETED;
-            _PyFrame_ClearLocals((_PyInterpreterFrame *)gen->gi_iframe);
             Py_RETURN_NONE;
         }
     }

Python/frame.c

@@ -115,18 +115,6 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
     }
 }
 
-void
-_PyFrame_ClearLocals(_PyInterpreterFrame *frame)
-{
-    assert(frame->stacktop >= 0);
-    int stacktop = frame->stacktop;
-    frame->stacktop = 0;
-    for (int i = 0; i < stacktop; i++) {
-        Py_XDECREF(frame->localsplus[i]);
-    }
-    Py_CLEAR(frame->f_locals);
-}
-
 void
 _PyFrame_ClearExceptCode(_PyInterpreterFrame *frame)
 {
@@ -147,8 +135,12 @@ _PyFrame_ClearExceptCode(_PyInterpreterFrame *frame)
         }
         Py_DECREF(f);
     }
-    _PyFrame_ClearLocals(frame);
+    assert(frame->stacktop >= 0);
+    for (int i = 0; i < frame->stacktop; i++) {
+        Py_XDECREF(frame->localsplus[i]);
+    }
     Py_XDECREF(frame->frame_obj);
+    Py_XDECREF(frame->f_locals);
     Py_DECREF(frame->f_funcobj);
 }