Remove opcode

Author: Fidget-Spinner

Lib/test/test_generated_cases.py

@@ -1886,6 +1886,8 @@ def test_basic(self):
         output = """
 Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_OP(TAIL_CALL_PARAMS) {
     {
+        int opcode = next_instr->op.code;
+        (void)(opcode);
         frame->instr_ptr = next_instr;
         next_instr += 1;
         INSTRUCTION_STATS(OP);
@@ -1927,6 +1929,8 @@ def test_label_transformed(self):
 
 Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_OP(TAIL_CALL_PARAMS) {
     {
+        int opcode = next_instr->op.code;
+        (void)(opcode);
         frame->instr_ptr = next_instr;
         next_instr += 1;
         INSTRUCTION_STATS(OP);
@@ -1944,7 +1948,7 @@ def test_label_transformed(self):
             if (x) {
                 goto baz;
             }
-            return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0, 0);
+            return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0);
         }
         """
         self.run_cases_test(input, output, output_labels)

Python/ceval.c

@@ -772,7 +772,7 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
 static inline PyObject *
 _TAIL_CALL_entry(TAIL_CALL_PARAMS)
 {
-    opcode = next_instr->op.code;
+    int opcode = next_instr->op.code;
     oparg = next_instr->op.arg;
     return (INSTRUCTION_TABLE[opcode])(TAIL_CALL_ARGS);
 }

Python/ceval_macros.h

@@ -70,8 +70,8 @@
 #define INSTRUCTION_STATS(op) ((void)0)
 #endif
 
-#define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, int opcode, int oparg
-#define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, opcode, oparg
+#define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, int oparg
+#define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, oparg
 
 #ifdef Py_TAIL_CALL_INTERP
     // Note: [[clang::musttail]] works for GCC 15, but not __attribute__((musttail)) at the moment.
@@ -125,8 +125,15 @@ do { \
 
 
 /* Do interpreter dispatch accounting for tracing and instrumentation */
+#ifdef Py_TAIL_CALL_INTERP
+#   define DEFINE_OPCODE_IF_NEEDED() int opcode;
+#else
+#   define DEFINE_OPCODE_IF_NEEDED()
+#endif
+
 #define DISPATCH() \
     { \
+        DEFINE_OPCODE_IF_NEEDED(); \
         assert(frame->stackpointer == NULL); \
         NEXTOPARG(); \
         PRE_DISPATCH_GOTO(); \

Python/generated_tail_call_handlers.c.h

@@ -137,8 +137,12 @@ def write_single_inst(
     emitter: Emitter,
     name: str,
     inst: Instruction,
-    uses_this: Callable[[Instruction], bool]
+    uses_this: Callable[[Instruction], bool],
+    is_in_tail_call: bool = False
 ) -> None:
+    if is_in_tail_call:
+        out.emit("int opcode = next_instr->op.code;\n")
+        out.emit("(void)(opcode);\n")
     needs_this = uses_this(inst)
     unused_guard = "(void)this_instr;\n"
     if inst.properties.needs_prev:

Python/generated_tail_call_labels.c.h

@@ -54,23 +54,6 @@ def __init__(self, out: CWriter, analysis: Analysis):
         super().__init__(out)
         self.analysis = analysis
 
-    def go_to_instruction(
-        self,
-        tkn: Token,
-        tkn_iter: TokenIterator,
-        uop: Uop | Label,
-        storage: Storage,
-        inst: Instruction | None,
-    ) -> bool:
-        next(tkn_iter)
-        name = next(tkn_iter)
-        next(tkn_iter)
-        next(tkn_iter)
-        assert name.kind == "IDENTIFIER"
-        self.out.start_line()
-        self.emit(f"Py_MUSTTAIL return (INSTRUCTION_TABLE[{name.text}])(frame, stack_pointer, tstate, this_instr, opcode, oparg);\n")
-        return True
-
     def deopt_if(
         self,
         tkn: Token,
@@ -92,7 +75,8 @@ def deopt_if(
         family_name = inst.family.name
         self.emit(f"UPDATE_MISS_STATS({family_name});\n")
         self.emit(f"assert(_PyOpcode_Deopt[opcode] == ({family_name}));\n")
-        self.emit(f"Py_MUSTTAIL return _TAIL_CALL_{family_name}(frame, stack_pointer, tstate, this_instr, opcode, oparg);\n")
+        # Note it's not TAIL_CALL_ARGS, it passes this_instr instead of next_instr.
+        self.emit(f"Py_MUSTTAIL return _TAIL_CALL_{family_name}(frame, stack_pointer, tstate, this_instr, oparg);\n")
         self.emit("}\n")
         return not always_true(first_tkn)
 
@@ -145,7 +129,7 @@ def dispatch(
         next(tkn_iter)
         next(tkn_iter)
         self.out.start_line()
-        self.emit("return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0, 0);\n")
+        self.emit("return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0);\n")
         return True
 
 
@@ -165,7 +149,6 @@ def generate_label_handlers(
     for name, label in analysis.labels.items():
         emitter.emit(f"{function_proto(name)}\n")
         emitter.emit_label(label)
-
         emitter.emit("\n")
         emitter.emit("\n")
 
@@ -195,6 +178,7 @@ def generate_tier1(
     emitter = TailCallCevalLabelsEmitter(out)
     generate_tier1_labels(analysis, emitter)
     labels_outfile.write(FOOTER)
+
     write_header(__file__, filenames, outfile)
     outfile.write(PRELUDE)
     out = CWriter(outfile, 0, lines)
@@ -214,7 +198,7 @@ def generate_tier1(
         # escaping locals.
         # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118430#c1
         out.emit("{\n")
-        write_single_inst(out, emitter, name, inst, uses_this)
+        write_single_inst(out, emitter, name, inst, uses_this, is_in_tail_call=True)
         out.emit("}\n")
         if not inst.parts[-1].properties.always_exits:
             out.emit("DISPATCH();\n")
@@ -234,6 +218,7 @@ def generate_tier1(
     out.emit(function_proto("UNKNOWN_OPCODE"))
     out.emit(" {\n")
     out.emit("{\n")
+    out.emit("int opcode = next_instr->op.code;\n")
     out.emit("""
 _PyErr_Format(tstate, PyExc_SystemError,
               "%U:%d: unknown opcode %d",