From: Dino Viehland <dinoviehland@meta.com>
Date: Wed, 10 Sep 2025 01:17:00 +0000 (-0700)
Subject: gh-138230: Remove dead code in code gen - codegen_check_annotation is only calle... 
X-Git-Tag: v3.15.0a1~426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04c7f362055477efeaf3d539da30a608cdbbdc1e;p=thirdparty%2FPython%2Fcpython.git

gh-138230: Remove dead code in code gen - codegen_check_annotation is only calle… (#138228)

Remove dead code in code gen - codegen_check_annotation is only called if future annotations are enabled, and if future annotations are enabled it does nothing.
---

diff --git a/Python/codegen.c b/Python/codegen.c
index b0778518b2ee..ed172dbc0e29 100644
--- a/Python/codegen.c
+++ b/Python/codegen.c
@@ -5414,23 +5414,6 @@ codegen_check_ann_expr(compiler *c, expr_ty e)
     return SUCCESS;
 }
 
-static int
-codegen_check_annotation(compiler *c, stmt_ty s)
-{
-    /* Annotations of complex targets does not produce anything
-       under annotations future */
-    if (FUTURE_FEATURES(c) & CO_FUTURE_ANNOTATIONS) {
-        return SUCCESS;
-    }
-
-    /* Annotations are only evaluated in a module or class. */
-    if (SCOPE_TYPE(c) == COMPILE_SCOPE_MODULE ||
-        SCOPE_TYPE(c) == COMPILE_SCOPE_CLASS) {
-        return codegen_check_ann_expr(c, s->v.AnnAssign.annotation);
-    }
-    return SUCCESS;
-}
-
 static int
 codegen_check_ann_subscr(compiler *c, expr_ty e)
 {
@@ -5524,10 +5507,6 @@ codegen_annassign(compiler *c, stmt_ty s)
                      targ->kind);
         return ERROR;
     }
-    /* Annotation is evaluated last. */
-    if (future_annotations && !s->v.AnnAssign.simple && codegen_check_annotation(c, s) < 0) {
-        return ERROR;
-    }
     return SUCCESS;
 }