From c9851325977f7a5acee6cc53d567f25039490471 Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Sat, 29 Aug 2026 22:40:37 +0100
Subject: [PATCH] gh-156466: fix cleanup on error after Enter in
 codegen_enter_scope (GH-156467) (cherry picked from commit
 41b3f0af266b408438cab36625c6ad71040d38e5)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
---
 Python/codegen.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Python/codegen.c b/Python/codegen.c
index 529c1733598e381..e4512ae1382e98e 100644
--- a/Python/codegen.c
+++ b/Python/codegen.c
@@ -691,13 +691,13 @@ codegen_enter_scope(compiler *c, identifier name, int scope_type,
          * of 0. This is because RETURN_GENERATOR pushes the generator
          before returning. */
         location loc = LOCATION(lineno, lineno, -1, -1);
-        ADDOP(c, loc, RETURN_GENERATOR);
-        ADDOP(c, loc, POP_TOP);
+        ADDOP_IN_SCOPE(c, loc, RETURN_GENERATOR);
+        ADDOP_IN_SCOPE(c, loc, POP_TOP);
     }
 
-    ADDOP_I(c, loc, RESUME, RESUME_AT_FUNC_START);
+    ADDOP_I_IN_SCOPE(c, loc, RESUME, RESUME_AT_FUNC_START);
     if (scope_type == COMPILE_SCOPE_MODULE) {
-        ADDOP(c, loc, ANNOTATIONS_PLACEHOLDER);
+        ADDOP_IN_SCOPE(c, loc, ANNOTATIONS_PLACEHOLDER);
     }
     return SUCCESS;
 }