Skip to content

gh-107901: jump leaving an exception handler doesn't need an eval break check #113943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 2 commits into from
Jan 11, 2024
Merged

gh-107901: jump leaving an exception handler doesn't need an eval break check #113943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebdcefa
gh-107901: jump leaving an exception handler doesn't need an eval bre…
iritkatriel Jan 8, 2024
78be265
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 11, 2024
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
4 changes: 2 additions & 2 deletions Lib/test/test_dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,11 +578,11 @@ async def _asyncwith(c):

%4d L12: CLEANUP_THROW

-- L13: JUMP_BACKWARD 26 (to L5)
-- L13: JUMP_BACKWARD_NO_INTERRUPT 25 (to L5)

%4d L14: CLEANUP_THROW

-- L15: JUMP_BACKWARD 11 (to L11)
-- L15: JUMP_BACKWARD_NO_INTERRUPT 9 (to L11)

%4d L16: PUSH_EXC_INFO
WITH_EXCEPT_START
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-01-11-14-03-31.gh-issue-107901.U65IyC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A jump leaving an exception handler back to normal code no longer checks the eval breaker.
2 changes: 1 addition & 1 deletion Python/flowgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2164,7 +2164,7 @@ push_cold_blocks_to_end(cfg_builder *g) {
if (!IS_LABEL(b->b_next->b_label)) {
b->b_next->b_label.id = next_lbl++;
}
basicblock_addop(explicit_jump, JUMP, b->b_next->b_label.id, NO_LOCATION);
basicblock_addop(explicit_jump, JUMP_NO_INTERRUPT, b->b_next->b_label.id, NO_LOCATION);
explicit_jump->b_cold = 1;
explicit_jump->b_next = b->b_next;
b->b_next = explicit_jump;
Expand Down