languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 07:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-120225: fix crash in compiler on empty block at end of exception handler (#120235)

Browse source
This commit is contained in:
Irit Katriel 2024-06-07 22:37:35 +01:00 committed by GitHub
parent e6076d1e13
commit 4fc82b6d3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_compile.py
View file

@ -1409,6 +1409,16 @@ def f():
for kw in ("except", "except*"):
exec(code % kw, g, l);
def test_regression_gh_120225(self):
async def name_4():
match b'':
case True:
pass
case name_5 if f'e':
{name_3: name_4 async for name_2 in name_5}
case []:
pass
[[]]
@requires_debug_ranges()
class TestSourcePositions(unittest.TestCase):

1
Misc/NEWS.d/next/Core and Builtins/2024-06-07-16-09-04.gh-issue-120225.kuYf9t.rst Normal file
View file

@ -0,0 +1 @@
Fix crash in compiler on empty block at end of exception handler.

8
Python/flowgraph.c
View file

@ -2304,15 +2304,11 @@ push_cold_blocks_to_end(cfg_builder *g) {
if (!IS_LABEL(b->b_next->b_label)) {
b->b_next->b_label.id = next_lbl++;
}
cfg_instr *prev_instr = basicblock_last_instr(b);
// b cannot be empty because at the end of an exception handler
// there is always a POP_EXCEPT + RERAISE/RETURN
assert(prev_instr);
basicblock_addop(explicit_jump, JUMP_NO_INTERRUPT, b->b_next->b_label.id,
prev_instr->i_loc);
NO_LOCATION);
explicit_jump->b_cold = 1;
explicit_jump->b_next = b->b_next;
explicit_jump->b_predecessors = 1;
b->b_next = explicit_jump;
/* set target */