Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

GH-111485: Fix handling of FOR_ITER in Tier 2 (GH-113394)

This commit is contained in:
Mark Shannon 2023-12-24 18:07:34 +00:00 committed by GitHub
parent 0c574540e0
commit 9a35794fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Python/optimizer.c
View File

@ -518,11 +518,11 @@ top: // Jump here after _PUSH_FRAME or likely branches
uint32_t opcode = instr->op.code; uint32_t opcode = instr->op.code;
uint32_t oparg = instr->op.arg; uint32_t oparg = instr->op.arg;
uint32_t extras = 0; uint32_t extended = 0;
if (opcode == EXTENDED_ARG) { if (opcode == EXTENDED_ARG) {
instr++; instr++;
extras += 1; extended = 1;
opcode = instr->op.code; opcode = instr->op.code;
oparg = (oparg << 8) | instr->op.arg; oparg = (oparg << 8) | instr->op.arg;
if (opcode == EXTENDED_ARG) { if (opcode == EXTENDED_ARG) {
@ -577,6 +577,7 @@ top: // Jump here after _PUSH_FRAME or likely branches
} }
case JUMP_BACKWARD: case JUMP_BACKWARD:
case JUMP_BACKWARD_NO_INTERRUPT:
{ {
if (instr + 2 - oparg == initial_instr && code == initial_code) { if (instr + 2 - oparg == initial_instr && code == initial_code) {
RESERVE(1); RESERVE(1);
@ -623,15 +624,7 @@ top: // Jump here after _PUSH_FRAME or likely branches
int offset = expansion->uops[i].offset + 1; int offset = expansion->uops[i].offset + 1;
switch (expansion->uops[i].size) { switch (expansion->uops[i].size) {
case OPARG_FULL: case OPARG_FULL:
if (extras && OPCODE_HAS_JUMP(opcode)) { assert(opcode != JUMP_BACKWARD_NO_INTERRUPT && opcode != JUMP_BACKWARD);
if (opcode == JUMP_BACKWARD_NO_INTERRUPT) {
oparg -= extras;
}
else {
assert(opcode != JUMP_BACKWARD);
oparg += extras;
}
}
break; break;
case OPARG_CACHE_1: case OPARG_CACHE_1:
operand = read_u16(&instr[offset].cache); operand = read_u16(&instr[offset].cache);
@ -656,7 +649,7 @@ top: // Jump here after _PUSH_FRAME or likely branches
uop = _PyUOp_Replacements[uop]; uop = _PyUOp_Replacements[uop];
assert(uop != 0); assert(uop != 0);
if (uop == _FOR_ITER_TIER_TWO) { 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 || assert(_PyCode_CODE(code)[target-1].op.code == END_FOR ||
_PyCode_CODE(code)[target-1].op.code == INSTRUMENTED_END_FOR); _PyCode_CODE(code)[target-1].op.code == INSTRUMENTED_END_FOR);
} }