gh-130924: Do not create cells for usages of names in local annotations (#131843)

diff --git a/Include/internal/pycore_symtable.h b/Include/internal/pycore_symtable.h
index a347db1672296136c07977d640c8b4f4f1baa525..98099b4a497b01631d6ba28e7d162e92855d8231 100644 (file)
--- a/Include/internal/pycore_symtable.h
+++ b/Include/internal/pycore_symtable.h
@@ -126,6 +126,7 @@ typedef struct _symtable_entry {
     unsigned ste_method : 1; /* true if block is a function block defined in class scope */
     unsigned ste_has_conditional_annotations : 1; /* true if block has conditionally executed annotations */
     unsigned ste_in_conditional_block : 1; /* set while we are inside a conditionally executed block */
+    unsigned ste_in_unevaluated_annotation : 1; /* set while we are processing an annotation that will not be evaluated */
     int ste_comp_iter_expr; /* non-zero if visiting a comprehension range expression */
     _Py_SourceLocation ste_loc; /* source location of block */
     struct _symtable_entry *ste_annotation_block; /* symbol table entry for this entry's annotations */

diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py
index 60908546bb26537b9c125ba4333c4db387fbbba1..9c70d27d29e89cc802a44cea293fef5e79bf66c1 100644 (file)
--- a/Lib/test/test_type_annotations.py
+++ b/Lib/test/test_type_annotations.py
@@ -3,7 +3,7 @@ import inspect
 import textwrap
 import types
 import unittest
-from test.support import run_code, check_syntax_error
+from test.support import run_code, check_syntax_error, cpython_only
 
 
 class TypeAnnotationTests(unittest.TestCase):
@@ -109,6 +109,16 @@ class TypeAnnotationTests(unittest.TestCase):
             del D.__annotations__
         self.assertEqual(D.__annotations__, {})
 
+    @cpython_only
+    def test_no_cell(self):
+        # gh-130924: Test that uses of annotations in local scopes do not
+        # create cell variables.
+        def f(x):
+            a: x
+            return x
+
+        self.assertEqual(f.__code__.co_cellvars, ())
+
 
 def build_module(code: str, name: str = "top") -> types.ModuleType:
     ns = run_code(code)
@@ -352,6 +362,7 @@ class DeferredEvaluationTests(unittest.TestCase):
                 check_syntax_error(self, prelude + "(x): (yield)", "yield expression cannot be used within an annotation")
                 check_syntax_error(self, prelude + "(x): (yield from x)", "yield expression cannot be used within an annotation")
                 check_syntax_error(self, prelude + "(x): (y := 3)", "named expression cannot be used within an annotation")
+                check_syntax_error(self, prelude + "(x): (__debug__ := 3)", "named expression cannot be used within an annotation")
                 check_syntax_error(self, prelude + "(x): (await 42)", "await expression cannot be used within an annotation")
 
     def test_ignore_non_simple_annotations(self):

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-03-28-07-39-10.gh-issue-130924.l2Rbmj.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-28-07-39-10.gh-issue-130924.l2Rbmj.rst
new file mode 100644 (file)
index 0000000..ce6285f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-28-07-39-10.gh-issue-130924.l2Rbmj.rst
@@ -0,0 +1,3 @@
+Usage of a name in a function-scope annotation no longer triggers creation
+of a cell for that variable. This fixes a regression in earlier alphas of
+Python 3.14.

diff --git a/Python/symtable.c b/Python/symtable.c
index 622cd528f3a4818015d93fa60126780ac4c94135..748bd447dab0ad91953ee4d48e0ecc8a2737c0ec 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -141,6 +141,7 @@ ste_new(struct symtable *st, identifier name, _Py_block_ty block,
     ste->ste_needs_classdict = 0;
     ste->ste_has_conditional_annotations = 0;
     ste->ste_in_conditional_block = 0;
+    ste->ste_in_unevaluated_annotation = 0;
     ste->ste_annotation_block = NULL;
 
     ste->ste_has_docstring = 0;
@@ -2538,17 +2539,19 @@ symtable_visit_expr(struct symtable *st, expr_ty e)
             VISIT(st, expr, e->v.Slice.step);
         break;
     case Name_kind:
-        if (!symtable_add_def_ctx(st, e->v.Name.id,
-                                  e->v.Name.ctx == Load ? USE : DEF_LOCAL,
-                                  LOCATION(e), e->v.Name.ctx)) {
-            return 0;
-        }
-        /* Special-case super: it counts as a use of __class__ */
-        if (e->v.Name.ctx == Load &&
-            _PyST_IsFunctionLike(st->st_cur) &&
-            _PyUnicode_EqualToASCIIString(e->v.Name.id, "super")) {
-            if (!symtable_add_def(st, &_Py_ID(__class__), USE, LOCATION(e)))
+        if (!st->st_cur->ste_in_unevaluated_annotation) {
+            if (!symtable_add_def_ctx(st, e->v.Name.id,
+                                    e->v.Name.ctx == Load ? USE : DEF_LOCAL,
+                                    LOCATION(e), e->v.Name.ctx)) {
                 return 0;
+            }
+            /* Special-case super: it counts as a use of __class__ */
+            if (e->v.Name.ctx == Load &&
+                _PyST_IsFunctionLike(st->st_cur) &&
+                _PyUnicode_EqualToASCIIString(e->v.Name.id, "super")) {
+                if (!symtable_add_def(st, &_Py_ID(__class__), USE, LOCATION(e)))
+                    return 0;
+            }
         }
         break;
     /* child nodes of List and Tuple will have expr_context set */
@@ -2733,6 +2736,9 @@ symtable_visit_params(struct symtable *st, asdl_arg_seq *args)
 static int
 symtable_visit_annotation(struct symtable *st, expr_ty annotation, void *key)
 {
+    // Annotations in local scopes are not executed and should not affect the symtable
+    bool is_unevaluated = st->st_cur->ste_type == FunctionBlock;
+
     if ((st->st_cur->ste_type == ClassBlock || st->st_cur->ste_type == ModuleBlock)
             && st->st_cur->ste_in_conditional_block
             && !st->st_cur->ste_has_conditional_annotations)
@@ -2764,11 +2770,17 @@ symtable_visit_annotation(struct symtable *st, expr_ty annotation, void *key)
             return 0;
         }
     }
-    VISIT(st, expr, annotation);
+    if (is_unevaluated) {
+        st->st_cur->ste_in_unevaluated_annotation = 1;
+    }
+    int rc = symtable_visit_expr(st, annotation);
+    if (is_unevaluated) {
+        st->st_cur->ste_in_unevaluated_annotation = 0;
+    }
     if (!symtable_exit_block(st)) {
         return 0;
     }
-    return 1;
+    return rc;
 }
 
 static int