[3.12] gh-119897: Revert buggy optimization which was removed in 3.13 (#120467)

iritkatriel · web-flow · commit 5d997b5d4ef9 · 2024-06-18T10:45:40.000+01:00
diff --git a/Include/internal/pycore_frame.h b/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
diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py
@@ -83,8 +83,8 @@ def test_throw(self):
 
         for func, (cc, nc, _, _, _) in pr.stats.items():
             if func[2] == "<genexpr>":
-                self.assertEqual(cc, 1)
-                self.assertEqual(nc, 1)
+                self.assertEqual(cc, 2)
+                self.assertEqual(nc, 2)
 
 
 class TestCommandLine(unittest.TestCase):
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
@@ -6,6 +6,7 @@
 import unittest
 import weakref
 import inspect
+import types
 
 from test import support
 
@@ -89,9 +90,12 @@ def gen():
         self.assertEqual(gc.garbage, old_garbage)
 
     def test_lambda_generator(self):
-        # Issue #23192: Test that a lambda returning a generator behaves
+        # bpo-23192, gh-119897: Test that a lambda returning a generator behaves
         # like the equivalent function
         f = lambda: (yield 1)
+        self.assertIsInstance(f(), types.GeneratorType)
+        self.assertEqual(next(f()), 1)
+
         def g(): return (yield 1)
 
         # test 'yield from'
@@ -450,26 +454,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):
 
diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py
@@ -265,6 +265,10 @@ def g(p):
         f_ident = ident(f)
         g_ident = ident(g)
         self.check_events(g, [(1, 'call', g_ident),
+                              (2, 'call', f_ident),
+                              (2, 'return', f_ident),
+                              # once more; the generator is being garbage collected
+                              # and it will do a PY_THROW
                               (2, 'call', f_ident),
                               (2, 'return', f_ident),
                               (1, 'return', g_ident),
diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -374,6 +374,7 @@ static PyObject *
 gen_close(PyGenObject *gen, PyObject *args)
 {
     PyObject *retval;
+    PyObject *yf = _PyGen_yf(gen);
     int err = 0;
 
     if (gen->gi_frame_state == FRAME_CREATED) {
@@ -383,7 +384,6 @@ gen_close(PyGenObject *gen, PyObject *args)
     if (gen->gi_frame_state >= FRAME_COMPLETED) {
         Py_RETURN_NONE;
     }
-    PyObject *yf = _PyGen_yf(gen);
     if (yf) {
         PyFrameState state = gen->gi_frame_state;
         gen->gi_frame_state = FRAME_EXECUTING;
@@ -396,14 +396,12 @@ gen_close(PyGenObject *gen, PyObject *args)
      * YIELD_VALUE if the debugger has changed the lineno. */
     if (err == 0 && is_yield(frame->prev_instr)) {
         assert(is_resume(frame->prev_instr + 1));
-        int exception_handler_depth = frame->prev_instr[0].op.arg;
+        int exception_handler_depth = frame->prev_instr[0].op.code;
         assert(exception_handler_depth > 0);
         /* We can safely ignore the outermost try block
          * as it automatically generated to handle
          * StopIteration. */
         if (exception_handler_depth == 1) {
-            gen->gi_frame_state = FRAME_COMPLETED;
-            _PyFrame_ClearLocals((_PyInterpreterFrame *)gen->gi_iframe);
             Py_RETURN_NONE;
         }
     }
diff --git a/Python/frame.c b/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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,6 @@ _PyFrame_GetFrameObject(_PyInterpreterFrame *frame)`
`213`	`213`	`return _PyFrame_MakeAndSetFrameObject(frame);`
`214`	`214`	`}`
`215`	`215`
`216`		`-void`
`217`		`-_PyFrame_ClearLocals(_PyInterpreterFrame *frame);`
`218`		`-`
`219`	`216`	`/* Clears all references in the frame.`
`220`	`217`	`* If take is non-zero, then the _PyInterpreterFrame frame`
`221`	`218`	`* may be transferred to the frame object it references`
Original file line number	Diff line number	Diff line change
`@@ -115,18 +115,6 @@ take_ownership(PyFrameObject f, _PyInterpreterFrame frame)`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`-void`
`119`		`-_PyFrame_ClearLocals(_PyInterpreterFrame *frame)`
`120`		`-{`
`121`		`- assert(frame->stacktop >= 0);`
`122`		`- int stacktop = frame->stacktop;`
`123`		`- frame->stacktop = 0;`
`124`		`- for (int i = 0; i < stacktop; i++) {`
`125`		`- Py_XDECREF(frame->localsplus[i]);`
`126`		`- }`
`127`		`- Py_CLEAR(frame->f_locals);`
`128`		`-}`
`129`		`-`
`130`	`118`	`void`
`131`	`119`	`_PyFrame_ClearExceptCode(_PyInterpreterFrame *frame)`
`132`	`120`	`{`
`@@ -147,8 +135,12 @@ _PyFrame_ClearExceptCode(_PyInterpreterFrame *frame)`
`147`	`135`	`}`
`148`	`136`	`Py_DECREF(f);`
`149`	`137`	`}`
`150`		`- _PyFrame_ClearLocals(frame);`
	`138`	`+ assert(frame->stacktop >= 0);`
	`139`	`+ for (int i = 0; i < frame->stacktop; i++) {`
	`140`	`+ Py_XDECREF(frame->localsplus[i]);`
	`141`	`+ }`
`151`	`142`	`Py_XDECREF(frame->frame_obj);`
	`143`	`+ Py_XDECREF(frame->f_locals);`
`152`	`144`	`Py_DECREF(frame->f_funcobj);`
`153`	`145`	`}`
`154`	`146`