Skip to content

Move some of free standing functions to be ir::Blocks methods (part 2) #8155

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 20 commits into from
Jun 25, 2026
Merged

Move some of free standing functions to be ir::Blocks methods (part 2) #8155

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a452717
mark_except_handlers
ShaharNaveh Jun 23, 2026
6c8cfc3
mark_warm
ShaharNaveh Jun 23, 2026
537017d
mark_cold
ShaharNaveh Jun 24, 2026
7527138
push_cold_blocks_to_end
ShaharNaveh Jun 24, 2026
45ef817
check_cfg
ShaharNaveh Jun 24, 2026
0dbe677
jump thread
ShaharNaveh Jun 24, 2026
aa09f2f
basicblock_add_jump
ShaharNaveh Jun 24, 2026
6dbe226
convert_pseudo_conditional_jumps
ShaharNaveh Jun 24, 2026
9dd2060
normalize_jumps_in_block
ShaharNaveh Jun 24, 2026
388f7a6
basicblock_inline_small_or_no_lineno_blocks
ShaharNaveh Jun 24, 2026
8a64ccc
inline_small_or_no_lineno_blocks
ShaharNaveh Jun 24, 2026
a937154
basicblock_remove_redundant_nops
ShaharNaveh Jun 24, 2026
b0f9fff
remove_redundant_nops
ShaharNaveh Jun 24, 2026
d6b8558
no_redundant_nops
ShaharNaveh Jun 24, 2026
a4bc545
remove_redundant_jumps
ShaharNaveh Jun 24, 2026
cb91150
no_redundant_jumps
ShaharNaveh Jun 24, 2026
fc9bc37
remove_redundant_nops_and_jumps
ShaharNaveh Jun 24, 2026
15ce20a
blocks_new_block
ShaharNaveh Jun 24, 2026
e32c2c3
align tests
ShaharNaveh Jun 24, 2026
d8ae81f
clippy
ShaharNaveh Jun 24, 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
basicblock_add_jump
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jun 24, 2026
commit aa09f2f32c13ea420be9c7441bb0bce67e2010a8
88 changes: 43 additions & 45 deletions crates/codegen/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2561,11 +2561,52 @@ impl Blocks {
debug_assert!(target.target != BlockIdx::NULL);
if self[block_idx].instructions[instr_idx].target != target.target {
set_to_nop(&mut self[block_idx].instructions[instr_idx]);
basicblock_add_jump(self, block_idx, opcode, target.target, target)?;
self.basicblock_add_jump(block_idx, opcode, target.target, target)?;
return Ok(true);
}
Ok(false)
}

/// flowgraph.c basicblock_add_jump
fn basicblock_add_jump(
&mut self,
block_idx: BlockIdx,
instr: AnyInstruction,
target: BlockIdx,
loc_source: &InstructionInfo,
) -> crate::InternalResult<()> {
let last = basicblock_last_instr(&self[block_idx]);
if last.is_some_and(is_jump) {
return Err(InternalError::MalformedControlFlowGraph);
}
debug_assert!(target != BlockIdx::NULL);
let label = self[target].cpython_label;
debug_assert!(is_label(label));
let arg = instruction_sequence_label_oparg(label);
let block = &mut self[block_idx];
basicblock_addop(
block,
InstructionInfo {
instr,
arg,
target: BlockIdx::NULL,
location: loc_source.location,
end_location: loc_source.end_location,
except_handler: None,
lineno_override: loc_source.lineno_override,
},
)?;
let last = basicblock_last_instr_mut(block).expect("missing jump");
debug_assert!(match (last.instr, instr) {
(AnyInstruction::Real(last), AnyInstruction::Real(opcode)) =>
last.as_opcode() == opcode.as_opcode(),
(AnyInstruction::Pseudo(last), AnyInstruction::Pseudo(opcode)) =>
last.as_opcode() == opcode.as_opcode(),
_ => false,
});
last.target = target;
Ok(())
}
}

impl From<Vec<Block>> for Blocks {
Expand Down Expand Up @@ -5583,48 +5624,6 @@ fn assemble_exception_table(
Ok(table.into_boxed_slice())
}

/// flowgraph.c basicblock_add_jump
fn basicblock_add_jump(
blocks: &mut Blocks,
block_idx: BlockIdx,
instr: AnyInstruction,
target: BlockIdx,
loc_source: &InstructionInfo,
) -> crate::InternalResult<()> {
let bi = block_idx.idx();
let last = basicblock_last_instr(&blocks[bi]);
if last.is_some_and(is_jump) {
return Err(InternalError::MalformedControlFlowGraph);
}
debug_assert!(target != BlockIdx::NULL);
let label = blocks[target.idx()].cpython_label;
debug_assert!(is_label(label));
let arg = instruction_sequence_label_oparg(label);
let block = &mut blocks[bi];
basicblock_addop(
block,
InstructionInfo {
instr,
arg,
target: BlockIdx::NULL,
location: loc_source.location,
end_location: loc_source.end_location,
except_handler: None,
lineno_override: loc_source.lineno_override,
},
)?;
let last = basicblock_last_instr_mut(block).expect("missing jump");
debug_assert!(match (last.instr, instr) {
(AnyInstruction::Real(last), AnyInstruction::Real(opcode)) =>
last.as_opcode() == opcode.as_opcode(),
(AnyInstruction::Pseudo(last), AnyInstruction::Pseudo(opcode)) =>
last.as_opcode() == opcode.as_opcode(),
_ => false,
});
last.target = target;
Ok(())
}

/// pycore_opcode_utils.h IS_CONDITIONAL_JUMP_OPCODE
fn is_conditional_jump_opcode(instr: AnyInstruction) -> bool {
matches!(
Expand Down Expand Up @@ -5752,8 +5751,7 @@ fn normalize_jumps_in_block(blocks: &mut Blocks, block_idx: BlockIdx) -> crate::
lineno_override: last_ins.lineno_override,
},
)?;
basicblock_add_jump(
blocks,
blocks.basicblock_add_jump(
backwards_jump_idx,
PseudoOpcode::Jump.into(),
target,
Expand Down