GH-111520: Add back the operand local (GH-111813)

brandtbucher · web-flow · commit 31ad7e061ebe · 2023-11-13T17:27:19.000-08:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -992,19 +992,15 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 
     OPT_STAT_INC(traces_executed);
     _PyUOpInstruction *next_uop = current_executor->trace;
-#ifdef Py_DEBUG
-    uint64_t operand;  // Used by several DPRINTF() calls
-#endif
+    uint64_t operand;
 #ifdef Py_STATS
     uint64_t trace_uop_execution_counter = 0;
 #endif
 
     for (;;) {
         opcode = next_uop->opcode;
         oparg = next_uop->oparg;
-#ifdef Py_DEBUG
         operand = next_uop->operand;
-#endif
         DPRINTF(3,
                 "%4d: uop %s, oparg %d, operand %" PRIu64 ", stack_level %d\n",
                 (int)(next_uop - current_executor->trace),
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Tools/cases_generator/instructions.py b/Tools/cases_generator/instructions.py
@@ -166,7 +166,7 @@ def write_body(
                     f"{func}(&this_instr[{active.offset + 1}].cache);"
                 )
             else:
-                out.emit(f"{typ}{ceffect.name} = ({typ.strip()})next_uop[-1].operand;")
+                out.emit(f"{typ}{ceffect.name} = ({typ.strip()})operand;")
 
         # Write the body, substituting a goto for ERROR_IF() and other stuff
         assert dedent <= 0

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ def write_body(`
`166`	`166`	`f"{func}(&this_instr[{active.offset + 1}].cache);"`
`167`	`167`	`)`
`168`	`168`	`else:`
`169`		`- out.emit(f"{typ}{ceffect.name} = ({typ.strip()})next_uop[-1].operand;")`
	`169`	`+ out.emit(f"{typ}{ceffect.name} = ({typ.strip()})operand;")`
`170`	`170`
`171`	`171`	`# Write the body, substituting a goto for ERROR_IF() and other stuff`
`172`	`172`	`assert dedent <= 0`