GH-96793: Specialize FOR_ITER for generators. (GH-98772)

2 files changed, 21 insertions, 0 deletions

diff --git a/Lib/opcode.py b/Lib/opcode.py
index dfe06f8..990f5b6 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -328,6 +328,7 @@ _specializations = {
         "FOR_ITER_ADAPTIVE",
         "FOR_ITER_LIST",
         "FOR_ITER_RANGE",
+        "FOR_ITER_GEN",
     ],
     "LOAD_ATTR": [
         "LOAD_ATTR_ADAPTIVE",
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 42cc20c..492b77a 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -306,6 +306,26 @@ class ExceptionTest(unittest.TestCase):
         self.assertEqual(next(g), "done")
         self.assertEqual(sys.exc_info(), (None, None, None))
 
+    def test_nested_gen_except_loop(self):
+        def gen():
+            for i in range(100):
+                self.assertIsInstance(sys.exception(), TypeError)
+                yield "doing"
+
+        def outer():
+            try:
+                raise TypeError
+            except:
+                for x in gen():
+                    yield x
+
+        try:
+            raise ValueError
+        except Exception:
+            for x in outer():
+                self.assertEqual(x, "doing")
+        self.assertEqual(sys.exception(), None)
+
     def test_except_throw_exception_context(self):
         def gen():
             try: