Emit unused_guard in more places

brandtbucher · brandtbucher · commit cb3d9821af54 · 2025-01-22T12:14:38.000-08:00
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2816,7 +2816,7 @@ dummy_func(
         }
 
         tier1 op(_JIT, (--)) {
-            #ifdef _Py_TIER2
+        #ifdef _Py_TIER2
             _Py_BackoffCounter counter = this_instr[1].counter;
             if (backoff_counter_triggers(counter)) {
                 _Py_CODEUNIT *start = this_instr;
@@ -2841,7 +2841,7 @@ dummy_func(
             else {
                 ADVANCE_ADAPTIVE_COUNTER(this_instr[1].counter);
             }
-            #endif /* _Py_TIER2 */
+        #endif
         }
 
         macro(JUMP_BACKWARD) =
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Tools/cases_generator/tier1_generator.py b/Tools/cases_generator/tier1_generator.py
@@ -144,7 +144,7 @@ def generate_tier1(
         needs_this = uses_this(inst)
         out.emit("\n")
         out.emit(f"TARGET({name}) {{\n")
-        unused_guard = "(void)this_instr;\n" if inst.family is None else ""
+        unused_guard = "(void)this_instr;\n"
         if inst.properties.needs_prev:
             out.emit(f"_Py_CODEUNIT* const prev_instr = frame->instr_ptr;\n")
         if needs_this and not inst.is_target:

Original file line number	Diff line number	Diff line change
`@@ -2816,7 +2816,7 @@ dummy_func(`
`2816`	`2816`	`}`
`2817`	`2817`
`2818`	`2818`	`tier1 op(_JIT, (--)) {`
`2819`		`- #ifdef _Py_TIER2`
	`2819`	`+ #ifdef _Py_TIER2`
`2820`	`2820`	`_Py_BackoffCounter counter = this_instr[1].counter;`
`2821`	`2821`	`if (backoff_counter_triggers(counter)) {`
`2822`	`2822`	`_Py_CODEUNIT *start = this_instr;`
`@@ -2841,7 +2841,7 @@ dummy_func(`
`2841`	`2841`	`else {`
`2842`	`2842`	`ADVANCE_ADAPTIVE_COUNTER(this_instr[1].counter);`
`2843`	`2843`	`}`
`2844`		`- #endif /* _Py_TIER2 */`
	`2844`	`+ #endif`
`2845`	`2845`	`}`
`2846`	`2846`
`2847`	`2847`	`macro(JUMP_BACKWARD) =`