more future-proofing

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 7e9c672f6c2e986328f0d5791c2c74fb8dcb6aab..1e5230bad9764d491892e7325a6c7be477977f2e 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -7537,6 +7537,7 @@
                     JUMP_TO_JUMP_TARGET();
                 }
             }
+            #undef OFFSET_OF__PUSH_FRAME
             break;
         }
 
@@ -7551,6 +7552,7 @@
                     JUMP_TO_JUMP_TARGET();
                 }
             }
+            #undef OFFSET_OF_YIELD_VALUE
             break;
         }
 
@@ -7565,6 +7567,7 @@
                     JUMP_TO_JUMP_TARGET();
                 }
             }
+            #undef OFFSET_OF_RETURN_VALUE
             break;
         }
 
@@ -7579,12 +7582,9 @@
                     JUMP_TO_JUMP_TARGET();
                 }
             }
+            #undef OFFSET_OF_RETURN_GENERATOR
             break;
         }
 
-        #undef OFFSET_OFRETURN_VALUE
-        #undef OFFSET_OFYIELD_VALUE
-        #undef OFFSET_OF_PUSH_FRAME
-        #undef OFFSET_OFRETURN_GENERATOR
 
 #undef TIER_TWO

diff --git a/Tools/cases_generator/tier2_generator.py b/Tools/cases_generator/tier2_generator.py
index c23eb4a50f4a7cc60f7f3fcdd79b6df37d0d18dd..9cba92d7ee75755d5580d705a134a1d913f81c1a 100644 (file)
--- a/Tools/cases_generator/tier2_generator.py
+++ b/Tools/cases_generator/tier2_generator.py
@@ -234,6 +234,8 @@ def generate_tier2(
         if name_offset_pair := offset_strs.get(name):
             out.emit(f"#define OFFSET_OF_{name_offset_pair[0]} ({name_offset_pair[1]})\n")
         stack = write_uop(uop, emitter, stack)
+        if name_offset_pair:
+            out.emit(f"#undef OFFSET_OF_{name_offset_pair[0]}\n")        
         out.start_line()
         if not uop.properties.always_exits:
             out.emit("break;\n")
@@ -241,8 +243,6 @@ def generate_tier2(
         out.emit("}")
         out.emit("\n\n")
 
-    for name, offset_str in offset_strs.values():
-        out.emit(f"#undef OFFSET_OF{name}\n")
     out.emit("\n")
     outfile.write("#undef TIER_TWO\n")