Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-124871: fix 'visited' tracking in compiler's reachability analysis #124952

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
merged 2 commits into from
Oct 4, 2024
Merged

gh-124871: fix 'visited' tracking in compiler's reachability analysis #124952

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
fb8a0c2
gh-124871: fix 'visited' tracking in reachability analysis
iritkatriel Oct 3, 2024
680c708
Merge branch 'main' into gh-124871
iritkatriel Oct 4, 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
13 changes: 13 additions & 0 deletions Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,19 @@ def test_dead_code_with_except_handler_compiles(self):
x = 2
"""), '<eval>', 'exec')

def test_try_except_in_while_with_chained_condition_compiles(self):
# see gh-124871
compile(textwrap.dedent("""
name_1, name_2, name_3 = 1, 2, 3
while name_3 <= name_2 > name_1:
try:
raise
except:
pass
finally:
pass
"""), '<eval>', 'exec')

def test_compile_invalid_namedexpr(self):
# gh-109351
m = ast.Module(
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-10-03-22-26-39.gh-issue-124871.tAMF47.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix compiler bug (in some versions of 3.13) where an assertion fails during reachability
analysis.
5 changes: 3 additions & 2 deletions Python/flowgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,13 +1001,14 @@ remove_unreachable(basicblock *entryblock) {
basicblock **sp = stack;
entryblock->b_predecessors = 1;
*sp++ = entryblock;
entryblock->b_visited = 1;
while (sp > stack) {
basicblock *b = *(--sp);
b->b_visited = 1;
if (b->b_next && BB_HAS_FALLTHROUGH(b)) {
if (!b->b_next->b_visited) {
assert(b->b_next->b_predecessors == 0);
*sp++ = b->b_next;
b->b_next->b_visited = 1;
}
b->b_next->b_predecessors++;
}
Expand All @@ -1017,8 +1018,8 @@ remove_unreachable(basicblock *entryblock) {
if (is_jump(instr) || is_block_push(instr)) {
target = instr->i_target;
if (!target->b_visited) {
assert(target->b_predecessors == 0 || target == b->b_next);
*sp++ = target;
target->b_visited = 1;
}
target->b_predecessors++;
}
Expand Down
Loading