diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-12-24 18:07:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-24 18:07:34 (GMT) |
| commit | 9a35794fcbe994f0eb36c32d8f24d307837c9412 (patch) | |
| tree | 8febd46ff9322380388142feb9c378931aed8f20 /Python/optimizer.c | |
| parent | 0c574540e07792cef5487aef61ab38bfe404060f (diff) | |
| download | cpython-9a35794fcbe994f0eb36c32d8f24d307837c9412.zip cpython-9a35794fcbe994f0eb36c32d8f24d307837c9412.tar.gz cpython-9a35794fcbe994f0eb36c32d8f24d307837c9412.tar.bz2 | |
GH-111485: Fix handling of FOR_ITER in Tier 2 (GH-113394)
Diffstat (limited to 'Python/optimizer.c')
| -rw-r--r-- | Python/optimizer.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Python/optimizer.c b/Python/optimizer.c index 0ff1619..f27af14 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -518,11 +518,11 @@ top: // Jump here after _PUSH_FRAME or likely branches uint32_t opcode = instr->op.code; uint32_t oparg = instr->op.arg; - uint32_t extras = 0; + uint32_t extended = 0; if (opcode == EXTENDED_ARG) { instr++; - extras += 1; + extended = 1; opcode = instr->op.code; oparg = (oparg << 8) | instr->op.arg; if (opcode == EXTENDED_ARG) { @@ -577,6 +577,7 @@ top: // Jump here after _PUSH_FRAME or likely branches } case JUMP_BACKWARD: + case JUMP_BACKWARD_NO_INTERRUPT: { if (instr + 2 - oparg == initial_instr && code == initial_code) { RESERVE(1); @@ -623,15 +624,7 @@ top: // Jump here after _PUSH_FRAME or likely branches int offset = expansion->uops[i].offset + 1; switch (expansion->uops[i].size) { case OPARG_FULL: - if (extras && OPCODE_HAS_JUMP(opcode)) { - if (opcode == JUMP_BACKWARD_NO_INTERRUPT) { - oparg -= extras; - } - else { - assert(opcode != JUMP_BACKWARD); - oparg += extras; - } - } + assert(opcode != JUMP_BACKWARD_NO_INTERRUPT && opcode != JUMP_BACKWARD); break; case OPARG_CACHE_1: operand = read_u16(&instr[offset].cache); @@ -656,7 +649,7 @@ top: // Jump here after _PUSH_FRAME or likely branches uop = _PyUOp_Replacements[uop]; assert(uop != 0); if (uop == _FOR_ITER_TIER_TWO) { - target += 1 + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1; + target += 1 + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1 + extended; assert(_PyCode_CODE(code)[target-1].op.code == END_FOR || _PyCode_CODE(code)[target-1].op.code == INSTRUMENTED_END_FOR); } |