Apply suggestions

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -5384,10 +5384,6 @@ dummy_func(
 
         tier2 op(_ERROR_POP_N, (target/2 --)) {
             assert(oparg == 0);
-            _Py_CODEUNIT *current_instr = _PyFrame_GetBytecode(frame) + target;
-            _Py_CODEUNIT *next_instr = current_instr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[current_instr->op.code]];
-            // gh-140104: The exception handler expects frame->instr_ptr to be pointing to next_instr, not this_instr!
-            frame->instr_ptr = next_instr;
             SYNC_SP();
             GOTO_TIER_ONE(NULL);
         }

Python/bytecodes.c

@@ -358,7 +358,9 @@ do {                                                   \
     frame = tstate->current_frame;                     \
     stack_pointer = _PyFrame_GetStackPointer(frame);   \
     if (next_instr == NULL) {                          \
-        next_instr = frame->instr_ptr;                 \
+        /* gh-140104: The exception handler expects frame->instr_ptr
+            to be pointing to next_instr, not this_instr! */ \
+        next_instr = frame->instr_ptr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[frame->instr_ptr->op.code]];                 \
         JUMP_TO_LABEL(error);                          \
     }                                                  \
     DISPATCH();                                        \

Python/ceval_macros.h

@@ -147,7 +147,7 @@ def generate_instruction_formats(analysis: Analysis, out: CWriter) -> None:
 
 
 def generate_deopt_table(analysis: Analysis, out: CWriter) -> None:
-    out.emit("PyAPI_DATA(const uint8_t) _PyOpcode_Deopt[256];\n")
+    out.emit("extern const uint8_t _PyOpcode_Deopt[256];\n")
     out.emit("#ifdef NEED_OPCODE_METADATA\n")
     out.emit("const uint8_t _PyOpcode_Deopt[256] = {\n")
     deopts: list[tuple[str, str]] = []
@@ -170,7 +170,7 @@ def generate_deopt_table(analysis: Analysis, out: CWriter) -> None:
 
 
 def generate_cache_table(analysis: Analysis, out: CWriter) -> None:
-    out.emit("PyAPI_DATA(const uint8_t) _PyOpcode_Caches[256];\n")
+    out.emit("extern const uint8_t _PyOpcode_Caches[256];\n")
     out.emit("#ifdef NEED_OPCODE_METADATA\n")
     out.emit("const uint8_t _PyOpcode_Caches[256] = {\n")
     for inst in analysis.instructions.values():