revert change to signature of _PyFrame_PushTrampolineUnchecked

iritkatriel · iritkatriel · commit da6c97b4e0a7 · 2023-09-07T15:43:04.000+01:00
diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
@@ -67,7 +67,7 @@ typedef struct _PyInterpreterFrame {
     _Py_CODEUNIT *instr_ptr;
     int stacktop;  /* Offset of TOS from localsplus  */
     /* The return_offset determines where a `RETURN` should go in the caller,
-     * relative to `prev_instr`.
+     * relative to `prev_instr`/`instr_ptr`.
      * It is only meaningful to the callee,
      * so it needs to be set in any CALL (to a Python function)
      * or SEND (to a coroutine or generator).
@@ -285,7 +285,7 @@ _PyFrame_PushUnchecked(PyThreadState *tstate, PyFunctionObject *func, int null_l
 /* Pushes a trampoline frame without checking for space.
  * Must be guarded by _PyThreadState_HasStackSpace() */
 static inline _PyInterpreterFrame *
-_PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int stackdepth, int prev_instr, int instr_ptr_offset)
+_PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int stackdepth, int prev_instr)
 {
     CALL_STAT_INC(frames_pushed);
     _PyInterpreterFrame *frame = (_PyInterpreterFrame *)tstate->datastack_top;
@@ -301,7 +301,7 @@ _PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int
     frame->stacktop = code->co_nlocalsplus + stackdepth;
     frame->frame_obj = NULL;
     frame->prev_instr = _PyCode_CODE(code) + prev_instr;
-    frame->instr_ptr = _PyCode_CODE(code) + instr_ptr_offset;
+    frame->instr_ptr = _PyCode_CODE(code) + prev_instr + 1;
     frame->owner = FRAME_OWNED_BY_THREAD;
     frame->return_offset = 0;
     return frame;
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3157,7 +3157,7 @@ dummy_func(
             }
             Py_DECREF(tp);
             _PyInterpreterFrame *shim = _PyFrame_PushTrampolineUnchecked(
-                tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0, 1);
+                tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0);
             assert(_PyCode_CODE((PyCodeObject *)shim->f_executable)[1].op.code == EXIT_INIT_CHECK);
             /* Push self onto stack of shim */
             Py_INCREF(self);
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h

Original file line number	Diff line number	Diff line change
`@@ -3157,7 +3157,7 @@ dummy_func(`
`3157`	`3157`	`}`
`3158`	`3158`	`Py_DECREF(tp);`
`3159`	`3159`	`_PyInterpreterFrame *shim = _PyFrame_PushTrampolineUnchecked(`
`3160`		`- tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0, 1);`
	`3160`	`+ tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0);`
`3161`	`3161`	`assert(_PyCode_CODE((PyCodeObject *)shim->f_executable)[1].op.code == EXIT_INIT_CHECK);`
`3162`	`3162`	`/* Push self onto stack of shim */`
`3163`	`3163`	`Py_INCREF(self);`