Skip to content

Fix the next_block attribute of the new block in ControlFlowGraph.split_block #170

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
MatthieuDartiailh merged 2 commits into from
Sep 3, 2025
Merged

Fix the next_block attribute of the new block in ControlFlowGraph.split_block #170

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
b55e677
Fix the next_block of the new block in ControlFlowGraph.split_block
BergLucas Aug 26, 2025
29d660f
Improve the split_block tests to verify the next blocks
BergLucas Aug 26, 2025
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
1 change: 1 addition & 0 deletions src/bytecode/cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ def split_block(self, block: BasicBlock, index: int) -> BasicBlock:
del block[index:]

block2 = BasicBlock(instructions)
block2.next_block = block.next_block
block.next_block = block2

for block in self[block_index + 1 :]:
Expand Down
10 changes: 10 additions & 0 deletions tests/test_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,8 @@ def test_split_block(self):

label = code.split_block(code[0], 2)
self.assertIs(label, code[1])
self.assertIs(code[0].next_block, label)
self.assertIs(label.next_block, None)
self.assertBlocksEqual(
code,
[
Expand All @@ -546,6 +548,9 @@ def test_split_block(self):

label2 = code.split_block(code[0], 1)
self.assertIs(label2, code[1])
self.assertIs(code[0].next_block, label2)
self.assertIs(label2.next_block, label)
self.assertIs(label.next_block, None)
self.assertBlocksEqual(
code,
[Instr("LOAD_SMALL_INT" if PY314 else "LOAD_CONST", 1, lineno=1)],
Expand All @@ -567,6 +572,8 @@ def test_split_block_end(self):
# split at the end of the last block requires to add a new empty block
label = code.split_block(code[0], 2)
self.assertIs(label, code[1])
self.assertIs(code[0].next_block, label)
self.assertIs(label.next_block, None)
self.assertBlocksEqual(
code,
[
Expand All @@ -581,6 +588,8 @@ def test_split_block_end(self):
# add a new block
label = code.split_block(code[0], 2)
self.assertIs(label, code[1])
self.assertIs(code[0].next_block, label)
self.assertIs(label.next_block, None)
self.assertBlocksEqual(
code,
[
Expand All @@ -596,6 +605,7 @@ def test_split_block_dont_split(self):
# FIXME: is it really useful to support that?
block = code.split_block(code[0], 0)
self.assertIs(block, code[0])
self.assertIs(code[0].next_block, None)
self.assertBlocksEqual(
code,
[
Expand Down