diff options
| author | Mark Shannon <mark@hotpy.org> | 2024-06-17 13:40:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 13:40:11 (GMT) |
| commit | 274f844830898355f14d6edb6e71894a2f37e53c (patch) | |
| tree | 0f6ef2d7e7fd30f42fe83bbc05859314ac1c230a /Python/generated_cases.c.h | |
| parent | 79e09e60d865b7b3fcde9ccee86a502da82bb2b3 (diff) | |
| download | cpython-274f844830898355f14d6edb6e71894a2f37e53c.zip cpython-274f844830898355f14d6edb6e71894a2f37e53c.tar.gz cpython-274f844830898355f14d6edb6e71894a2f37e53c.tar.bz2 | |
GH-120619: Clean up `RETURN_VALUE` instruction (GH-120624)
* Rename _POP_FRAME to _RETURN_VALUE as it returns a value as well as popping a frame.
* Remove remaining _POP_FRAMEs
Diffstat (limited to 'Python/generated_cases.c.h')
| -rw-r--r-- | Python/generated_cases.c.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 0274f8b..8a6f5ff 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -5202,12 +5202,13 @@ INSTRUCTION_STATS(RETURN_CONST); PyObject *value; PyObject *retval; + PyObject *res; // _LOAD_CONST { value = GETITEM(FRAME_CO_CONSTS, oparg); Py_INCREF(value); } - // _POP_FRAME + // _RETURN_VALUE retval = value; { #if TIER_ONE @@ -5220,11 +5221,13 @@ _PyInterpreterFrame *dying = frame; frame = tstate->current_frame = dying->previous; _PyEval_FrameClearAndPop(tstate, dying); - _PyFrame_StackPush(frame, retval); LOAD_SP(); LOAD_IP(frame->return_offset); + res = retval; LLTRACE_RESUME_FRAME(); } + stack_pointer[0] = res; + stack_pointer += 1; DISPATCH(); } @@ -5265,6 +5268,7 @@ next_instr += 1; INSTRUCTION_STATS(RETURN_VALUE); PyObject *retval; + PyObject *res; retval = stack_pointer[-1]; #if TIER_ONE assert(frame != &entry_frame); @@ -5277,10 +5281,12 @@ _PyInterpreterFrame *dying = frame; frame = tstate->current_frame = dying->previous; _PyEval_FrameClearAndPop(tstate, dying); - _PyFrame_StackPush(frame, retval); LOAD_SP(); LOAD_IP(frame->return_offset); + res = retval; LLTRACE_RESUME_FRAME(); + stack_pointer[0] = res; + stack_pointer += 1; DISPATCH(); } |