diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-08-31 10:34:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 10:34:52 (GMT) |
| commit | 059bd4d299b384d2b434ccb106f91cb4bb03bbb1 (patch) | |
| tree | 0d5dfb60b2d62ebbca1a13788fc2ca64d457354c /Python/bytecodes.c | |
| parent | 194c6fb85e02ecbb1eedb26601e9d503c4d25174 (diff) | |
| download | cpython-059bd4d299b384d2b434ccb106f91cb4bb03bbb1.zip cpython-059bd4d299b384d2b434ccb106f91cb4bb03bbb1.tar.gz cpython-059bd4d299b384d2b434ccb106f91cb4bb03bbb1.tar.bz2 | |
GH-108614: Remove non-debug uses of `#if TIER_ONE` and `#if TIER_TWO` from `_POP_FRAME` op. (GH-108685)
Diffstat (limited to 'Python/bytecodes.c')
| -rw-r--r-- | Python/bytecodes.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 93926c0..7f39839 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -768,24 +768,25 @@ dummy_func( // different frame, and it's accounted for by _PUSH_FRAME. op(_POP_FRAME, (retval --)) { assert(EMPTY()); - _PyFrame_SetStackPointer(frame, stack_pointer); - _Py_LeaveRecursiveCallPy(tstate); - // GH-99729: We need to unlink the frame *before* clearing it: - _PyInterpreterFrame *dying = frame; #if TIER_ONE assert(frame != &entry_frame); #endif + STORE_SP(); + _Py_LeaveRecursiveCallPy(tstate); + // GH-99729: We need to unlink the frame *before* clearing it: + _PyInterpreterFrame *dying = frame; frame = tstate->current_frame = dying->previous; _PyEval_FrameClearAndPop(tstate, dying); frame->prev_instr += frame->return_offset; _PyFrame_StackPush(frame, retval); - #if TIER_ONE - goto resume_frame; - #endif - #if TIER_TWO - stack_pointer = _PyFrame_GetStackPointer(frame); - ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive; - #endif + LOAD_SP(); + LOAD_IP(); +#if LLTRACE && TIER_ONE + lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS()); + if (lltrace < 0) { + goto exit_unwind; + } +#endif } macro(RETURN_VALUE) = |