summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrit Katriel <1055913+iritkatriel@users.noreply.github.com>2023-10-12 10:02:42 (GMT)
committerGitHub <noreply@github.com>2023-10-12 10:02:42 (GMT)
commit7dd3c2b80064c39f1f0ebbc1f8486897b3148aa5 (patch)
tree091ded0f9496140972541a52a0b80f181c935a01
parent19b7ead5eb2fd1a0d19403e800a6f3adffbaac69 (diff)
downloadcpython-7dd3c2b80064c39f1f0ebbc1f8486897b3148aa5.zip
cpython-7dd3c2b80064c39f1f0ebbc1f8486897b3148aa5.tar.gz
cpython-7dd3c2b80064c39f1f0ebbc1f8486897b3148aa5.tar.bz2
gh-109094: remove redundant arg to _PyFrame_PushTrampolineUnchecked (GH-110759)
-rw-r--r--Include/internal/pycore_frame.h4
-rw-r--r--Python/bytecodes.c2
-rw-r--r--Python/generated_cases.c.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index c8fad15..bd44827 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -282,7 +282,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)
+_PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int stackdepth)
{
CALL_STAT_INC(frames_pushed);
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)tstate->datastack_top;
@@ -297,7 +297,7 @@ _PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int
frame->f_locals = NULL;
frame->stacktop = code->co_nlocalsplus + stackdepth;
frame->frame_obj = NULL;
- frame->prev_instr = _PyCode_CODE(code) + prev_instr;
+ frame->prev_instr = _PyCode_CODE(code);
frame->owner = FRAME_OWNED_BY_THREAD;
frame->return_offset = 0;
return frame;
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 62dc548..d7e2ecd 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -3204,7 +3204,7 @@ dummy_func(
}
Py_DECREF(tp);
_PyInterpreterFrame *shim = _PyFrame_PushTrampolineUnchecked(
- tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0);
+ tstate, (PyCodeObject *)&_Py_InitCleanup, 1);
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
index 8ae9bd2..6fbe80f 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -4176,7 +4176,7 @@
}
Py_DECREF(tp);
_PyInterpreterFrame *shim = _PyFrame_PushTrampolineUnchecked(
- tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0);
+ tstate, (PyCodeObject *)&_Py_InitCleanup, 1);
assert(_PyCode_CODE((PyCodeObject *)shim->f_executable)[1].op.code == EXIT_INIT_CHECK);
/* Push self onto stack of shim */
Py_INCREF(self);