Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Lib/test/test_capi/test_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,19 @@ def testfunc(n):
uops = get_opnames(ex)
self.assertIn(self.guard_is_false, uops)

def test_branch_coincident_targets(self):
# test for gh-144681: https://github.com/python/cpython/issues/144681
def testfunc(n):
for _ in range(n):
r = [x for x in range(10) if [].append(x) or True]
return r

res = testfunc(TIER2_THRESHOLD)
ex = get_first_executor(testfunc)

self.assertEqual(res, list(range(10)))
self.assertIsNotNone(ex)

def test_for_iter_tier_two(self):
class MyIter:
def __init__(self, n):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a JIT assertion failure when a conditional branch jumps to the same target as the fallthrough path.
7 changes: 6 additions & 1 deletion Python/optimizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,12 @@ _PyJit_translate_single_bytecode_to_trace(
_Py_CODEUNIT *computed_next_instr = computed_next_instr_without_modifiers + (computed_next_instr_without_modifiers->op.code == NOT_TAKEN);
_Py_CODEUNIT *computed_jump_instr = computed_next_instr_without_modifiers + oparg;
assert(next_instr == computed_next_instr || next_instr == computed_jump_instr);
int jump_happened = computed_jump_instr == next_instr;
int jump_happened;
if (computed_next_instr == computed_jump_instr) {
jump_happened = target_instr[1].cache & 1;
} else {
jump_happened = computed_jump_instr == next_instr;
}
assert(jump_happened == (target_instr[1].cache & 1));
uint32_t uopcode = BRANCH_TO_GUARD[opcode - POP_JUMP_IF_FALSE][jump_happened];
ADD_TO_TRACE(uopcode, 0, 0, INSTR_IP(jump_happened ? computed_next_instr : computed_jump_instr, old_code));
Expand Down
Loading