gh-132479: Fix crash with multiple comprehensions in annotations (#132778)

JelleZijlstra · web-flow · commit 01317bb44961 · 2025-04-21T13:49:59.000-07:00
diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py
@@ -723,3 +723,66 @@ def test_non_name_annotations(self):
         """
         expected = {"before": "before", "after": "after"}
         self.check_scopes(code, expected, expected)
+
+
+class RegressionTests(unittest.TestCase):
+    # gh-132479
+    def test_complex_comprehension_inlining(self):
+        # Test that the various repro cases from the issue don't crash
+        cases = [
+            """
+            (unique_name_0): 0
+            unique_name_1: (
+                0
+                for (
+                    0
+                    for unique_name_2 in 0
+                    for () in (0 for unique_name_3 in unique_name_4 for unique_name_5 in name_1)
+                ).name_3 in {0: 0 for name_1 in unique_name_8}
+                if name_1
+            )
+            """,
+            """
+            unique_name_0: 0
+            unique_name_1: {
+                0: 0
+                for unique_name_2 in [0 for name_0 in unique_name_4]
+                if {
+                    0: 0
+                    for unique_name_5 in 0
+                    if name_0
+                    if ((name_0 for unique_name_8 in unique_name_9) for [] in 0)
+                }
+            }
+            """,
+            """
+            0[0]: {0 for name_0 in unique_name_1}
+            unique_name_2: {
+                0: (lambda: name_0 for unique_name_4 in unique_name_5)
+                for unique_name_6 in ()
+                if name_0
+            }
+            """,
+        ]
+        for case in cases:
+            case = textwrap.dedent(case)
+            compile(case, "<test>", "exec")
+
+    def test_complex_comprehension_inlining_exec(self):
+        code = """
+            unique_name_1 = unique_name_5 = [1]
+            name_0 = 42
+            unique_name_7: {name_0 for name_0 in unique_name_1}
+            unique_name_2: {
+                0: (lambda: name_0 for unique_name_4 in unique_name_5)
+                for unique_name_6 in [1]
+                if name_0
+            }
+        """
+        mod = build_module(code)
+        annos = mod.__annotations__
+        self.assertEqual(annos.keys(), {"unique_name_7", "unique_name_2"})
+        self.assertEqual(annos["unique_name_7"], {True})
+        genexp = annos["unique_name_2"][0]
+        lamb = list(genexp)[0]
+        self.assertEqual(lamb(), 42)
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-21-09-22-15.gh-issue-132479.CCe2sE.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-21-09-22-15.gh-issue-132479.CCe2sE.rst
@@ -0,0 +1,2 @@
+Fix compiler crash in certain circumstances where multiple module-level
+annotations include comprehensions and other nested scopes.
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1394,7 +1394,7 @@ symtable_exit_block(struct symtable *st)
 }
 
 static int
-symtable_enter_existing_block(struct symtable *st, PySTEntryObject* ste)
+symtable_enter_existing_block(struct symtable *st, PySTEntryObject* ste, bool add_to_children)
 {
     if (PyList_Append(st->st_stack, (PyObject *)ste) < 0) {
         return 0;
@@ -1425,7 +1425,7 @@ symtable_enter_existing_block(struct symtable *st, PySTEntryObject* ste)
     if (ste->ste_type == ModuleBlock)
         st->st_global = st->st_cur->ste_symbols;
 
-    if (prev) {
+    if (add_to_children && prev) {
         if (PyList_Append(prev->ste_children, (PyObject *)ste) < 0) {
             return 0;
         }
@@ -1440,7 +1440,7 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
     PySTEntryObject *ste = ste_new(st, name, block, ast, loc);
     if (ste == NULL)
         return 0;
-    int result = symtable_enter_existing_block(st, ste);
+    int result = symtable_enter_existing_block(st, ste, /* add_to_children */true);
     Py_DECREF(ste);
     if (block == AnnotationBlock || block == TypeVariableBlock || block == TypeAliasBlock) {
         _Py_DECLARE_STR(format, ".format");
@@ -1866,7 +1866,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
             Py_DECREF(new_ste);
             return 0;
         }
-        if (!symtable_enter_existing_block(st, new_ste)) {
+        if (!symtable_enter_existing_block(st, new_ste, /* add_to_children */true)) {
             Py_DECREF(new_ste);
             return 0;
         }
@@ -2223,7 +2223,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
             Py_DECREF(new_ste);
             return 0;
         }
-        if (!symtable_enter_existing_block(st, new_ste)) {
+        if (!symtable_enter_existing_block(st, new_ste, /* add_to_children */true)) {
             Py_DECREF(new_ste);
             return 0;
         }
@@ -2776,7 +2776,8 @@ symtable_visit_annotation(struct symtable *st, expr_ty annotation, void *key)
         }
     }
     else {
-        if (!symtable_enter_existing_block(st, parent_ste->ste_annotation_block)) {
+        if (!symtable_enter_existing_block(st, parent_ste->ste_annotation_block,
+                                           /* add_to_children */false)) {
             return 0;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix compiler crash in certain circumstances where multiple module-level`
	`2`	`+annotations include comprehensions and other nested scopes.`
Original file line number	Diff line number	Diff line change
`@@ -1394,7 +1394,7 @@ symtable_exit_block(struct symtable *st)`
`1394`	`1394`	`}`
`1395`	`1395`
`1396`	`1396`	`static int`
`1397`		`-symtable_enter_existing_block(struct symtable st, PySTEntryObject ste)`
	`1397`	`+symtable_enter_existing_block(struct symtable st, PySTEntryObject ste, bool add_to_children)`
`1398`	`1398`	`{`
`1399`	`1399`	`if (PyList_Append(st->st_stack, (PyObject *)ste) < 0) {`
`1400`	`1400`	`return 0;`
`@@ -1425,7 +1425,7 @@ symtable_enter_existing_block(struct symtable st, PySTEntryObject ste)`
`1425`	`1425`	`if (ste->ste_type == ModuleBlock)`
`1426`	`1426`	`st->st_global = st->st_cur->ste_symbols;`
`1427`	`1427`
`1428`		`- if (prev) {`
	`1428`	`+ if (add_to_children && prev) {`
`1429`	`1429`	`if (PyList_Append(prev->ste_children, (PyObject *)ste) < 0) {`
`1430`	`1430`	`return 0;`
`1431`	`1431`	`}`
`@@ -1440,7 +1440,7 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,`
`1440`	`1440`	`PySTEntryObject *ste = ste_new(st, name, block, ast, loc);`
`1441`	`1441`	`if (ste == NULL)`
`1442`	`1442`	`return 0;`
`1443`		`- int result = symtable_enter_existing_block(st, ste);`
	`1443`	`+ int result = symtable_enter_existing_block(st, ste, /* add_to_children */true);`
`1444`	`1444`	`Py_DECREF(ste);`
`1445`	`1445`	`if (block == AnnotationBlock \|\| block == TypeVariableBlock \|\| block == TypeAliasBlock) {`
`1446`	`1446`	`_Py_DECLARE_STR(format, ".format");`
`@@ -1866,7 +1866,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)`
`1866`	`1866`	`Py_DECREF(new_ste);`
`1867`	`1867`	`return 0;`
`1868`	`1868`	`}`
`1869`		`- if (!symtable_enter_existing_block(st, new_ste)) {`
	`1869`	`+ if (!symtable_enter_existing_block(st, new_ste, /* add_to_children */true)) {`
`1870`	`1870`	`Py_DECREF(new_ste);`
`1871`	`1871`	`return 0;`
`1872`	`1872`	`}`
`@@ -2223,7 +2223,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)`
`2223`	`2223`	`Py_DECREF(new_ste);`
`2224`	`2224`	`return 0;`
`2225`	`2225`	`}`
`2226`		`- if (!symtable_enter_existing_block(st, new_ste)) {`
	`2226`	`+ if (!symtable_enter_existing_block(st, new_ste, /* add_to_children */true)) {`
`2227`	`2227`	`Py_DECREF(new_ste);`
`2228`	`2228`	`return 0;`
`2229`	`2229`	`}`
`@@ -2776,7 +2776,8 @@ symtable_visit_annotation(struct symtable st, expr_ty annotation, void key)`
`2776`	`2776`	`}`
`2777`	`2777`	`}`
`2778`	`2778`	`else {`
`2779`		`- if (!symtable_enter_existing_block(st, parent_ste->ste_annotation_block)) {`
	`2779`	`+ if (!symtable_enter_existing_block(st, parent_ste->ste_annotation_block,`
	`2780`	`+ /* add_to_children */false)) {`
`2780`	`2781`	`return 0;`
`2781`	`2782`	`}`
`2782`	`2783`	`}`