Skip to content

Bytecode parity #7885

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
youknowone merged 5 commits into from
May 19, 2026
Merged

Bytecode parity #7885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28af14e
Align codegen CFG cleanup with CPython
youknowone May 16, 2026
03119f2
Align codegen bytecode with CPython 3.14
youknowone May 16, 2026
4121265
Remove remove_jump_target_line_nops
youknowone May 16, 2026
f0f94ec
Keep except_handler blocks reachable in eliminate_unreachable_blocks
youknowone May 17, 2026
a1a6c30
Align bytecode CFG cleanup with CPython
youknowone May 19, 2026
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
Prev Previous commit
Next Next commit
Keep except_handler blocks reachable in eliminate_unreachable_blocks 
After convert_pseudo_ops lowers SETUP_FINALLY to a plain NOP, the only
remaining link from the try body to the except_handler block was the
per-instruction except_handler annotation. When earlier passes had
already removed every NOP that carried that annotation (e.g. an empty
try body with `pass`), the handler block became unreachable from the
entry block and its instructions were cleared, dropping the handler
entirely. Seed reachability with blocks already marked except_handler
so handler dispatch survives independent of the in-block annotation.

Also drop two expectedFailure markers in test_patma whose match-tracing
expectations now pass.
  • Loading branch information
@youknowone
youknowone committed May 19, 2026
commit f0f94ece5e25960407f5c4dc988a0b3b30ca081c
2 changes: 0 additions & 2 deletions Lib/test/test_patma.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3433,7 +3433,6 @@ def trace(frame, event, arg):
sys.settrace(old_trace)
return actual_linenos

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_default_wildcard(self):
def f(command): # 0
match command.split(): # 1
Expand Down Expand Up @@ -3494,7 +3493,6 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 3])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 3])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_unreachable_code(self):
def f(command): # 0
match command: # 1
Expand Down
7 changes: 7 additions & 0 deletions crates/codegen/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,13 @@ impl CodeInfo {
fn eliminate_unreachable_blocks(&mut self) {
let mut reachable = vec![false; self.blocks.len()];
reachable[0] = true;
// Exception handler blocks remain reachable via runtime dispatch even
// after convert_pseudo_ops drops SETUP_FINALLY targets from the CFG.
for (i, block) in self.blocks.iter().enumerate() {
if block.except_handler {
reachable[i] = true;
}
}

// Fixpoint: only mark targets of already-reachable blocks
let mut changed = true;
Expand Down