diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-10-12 10:34:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 10:34:32 +0100 |
| commit | 19b7ead5eb2fd1a0d19403e800a6f3adffbaac69 (patch) | |
| tree | 06d2c2db6d13cab161597286d03225659c3e91f9 /Python/optimizer.c | |
| parent | fb7843ee895ac7f6eeb58f356b1a320eea081cfc (diff) | |
| download | cpython-19b7ead5eb2fd1a0d19403e800a6f3adffbaac69.tar.gz cpython-19b7ead5eb2fd1a0d19403e800a6f3adffbaac69.zip | |
GH-109214: Convert _SAVE_CURRENT_IP to _SET_IP in tier 2 trace creation. (GH-110755)
Diffstat (limited to 'Python/optimizer.c')
| -rw-r--r-- | Python/optimizer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Python/optimizer.c b/Python/optimizer.c index 65b9638be25..955ac812177 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -648,6 +648,7 @@ pop_jump_if_bool: uint32_t orig_oparg = oparg; // For OPARG_TOP/BOTTOM for (int i = 0; i < nuops; i++) { oparg = orig_oparg; + uint32_t uop = expansion->uops[i].uop; uint64_t operand = 0; // Add one to account for the actual opcode/oparg pair: int offset = expansion->uops[i].offset + 1; @@ -680,6 +681,7 @@ pop_jump_if_bool: break; case OPARG_SET_IP: // op==_SET_IP; oparg=next instr oparg = INSTR_IP(instr + offset, code); + uop = _SET_IP; break; default: @@ -690,8 +692,8 @@ pop_jump_if_bool: expansion->uops[i].offset); Py_FatalError("garbled expansion"); } - ADD_TO_TRACE(expansion->uops[i].uop, oparg, operand); - if (expansion->uops[i].uop == _POP_FRAME) { + ADD_TO_TRACE(uop, oparg, operand); + if (uop == _POP_FRAME) { TRACE_STACK_POP(); DPRINTF(2, "Returning to %s (%s:%d) at byte offset %d\n", @@ -701,7 +703,7 @@ pop_jump_if_bool: 2 * INSTR_IP(instr, code)); goto top; } - if (expansion->uops[i].uop == _PUSH_FRAME) { + if (uop == _PUSH_FRAME) { assert(i + 1 == nuops); int func_version_offset = offsetof(_PyCallCache, func_version)/sizeof(_Py_CODEUNIT) |