FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Newtype for `[ir::Block]` by ShaharNaveh · Pull Request #8142 · RustPython/RustPython · GitHub

  1. RustPython
  2. RustPython

Repository navigation

Newtype for [ir::Block] #8142

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 4 commits into from
Jun 22, 2026
Conversation 2 Commits 4 Checks 25 Files changed
Merged

Newtype for [ir::Block] #8142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ba98db
Basic Blocks newtype
ShaharNaveh Jun 22, 2026
f19d2b5
fix tests
ShaharNaveh Jun 22, 2026
2ac86e7
clippy
ShaharNaveh Jun 22, 2026
e476f3c
cleanup some code
ShaharNaveh Jun 22, 2026
File filter

Filter by extension

Filter by extension .rs  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
ShaharNaveh committed Jun 22, 2026
commit f19d2b5b3deec92dc3d18f45610f3d8f7da10325
4 changes: 3 additions & 1 deletion crates/codegen/src/compile.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,10 @@ impl Compiler {
saved_annotations_instr_sequence,
) = {
let code = self.current_code_info();

(
mem::replace(&mut code.blocks, Blocks::default()),
//mem::replace(&mut code.blocks, Blocks::default()),
mem::take(&mut code.blocks),
mem::replace(&mut code.current_block, BlockIdx::new(0)),
mem::replace(&mut code.instr_sequence, ir::InstructionSequence::new()),
mem::replace(
Expand Down
34 changes: 17 additions & 17 deletions crates/codegen/src/ir.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ impl Blocks {
pub fn try_reserve(
&mut self,
additional: usize,
) -> Result<(), std::collections::TryReserveError> {
) -> Result<(), alloc::collections::TryReserveError> {
self.0.try_reserve(additional)
}

Expand Down Expand Up @@ -1388,13 +1388,13 @@ impl Index<BlockIdx> for Blocks {
type Output = Block;

fn index(&self, block_idx: BlockIdx) -> &Self::Output {
&self[block_idx.as_usize()]
&self.0[block_idx.as_usize()]
}
}

impl IndexMut<BlockIdx> for Blocks {
fn index_mut(&mut self, block_idx: BlockIdx) -> &mut Self::Output {
&mut self[block_idx.as_usize()]
&mut self.0[block_idx.as_usize()]
}
}

Expand Down Expand Up @@ -5968,7 +5968,7 @@ fn cfg_builder_use_label(
/// flowgraph.c _PyCfgBuilder_Addop
fn cfg_builder_addop(g: &mut CfgBuilder, info: InstructionInfo) -> crate::InternalResult<()> {
cfg_builder_maybe_start_new_block(g)?;
basicblock_addop(&mut g.blocks[g.current.idx()], info)
basicblock_addop(&mut g.blocks[g.current], info)
}

/// flowgraph.c cfg_builder_check
Expand Down Expand Up @@ -6311,8 +6311,8 @@ fn add_checks_for_loads_of_uninitialized_variables(

/// Follow chain of empty blocks to find first non-empty block.
fn next_nonempty_block(blocks: &Blocks, mut idx: BlockIdx) -> BlockIdx {
while idx != BlockIdx::NULL && blocks[idx.idx()].instruction_used == 0 {
idx = blocks[idx.idx()].next;
while idx != BlockIdx::NULL && blocks[idx].instruction_used == 0 {
idx = blocks[idx].next;
}
idx
}
Expand Down Expand Up @@ -6877,7 +6877,7 @@ mod tests {
flags: CodeFlags::empty(),
source_path: "source_path".to_owned(),
private: None,
blocks: vec![block],
blocks: Blocks::from([block]),
current_block: BlockIdx::new(0),
instr_sequence: instruction_sequence_new(),
instr_sequence_label_map: InstructionSequenceLabelMap::new(),
Expand Down Expand Up @@ -6956,7 +6956,7 @@ mod tests {
assert_eq!(stack.handlers.len(), CO_MAXBLOCKS + 2);
assert_eq!(stack.handlers[0], BlockIdx::NULL);

let mut blocks = vec![Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default()]);
assert!(except_stack_top(&stack, &blocks).is_none());

let setup = InstructionInfo {
Expand Down Expand Up @@ -7017,7 +7017,7 @@ mod tests {

#[test]
fn cfg_traversal_stack_resets_visited_and_allocates_for_blocks() {
let mut blocks = vec![Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default()]);
blocks[0].next = BlockIdx::new(1);
blocks[0].visited = true;
blocks[1].visited = true;
Expand Down Expand Up @@ -7231,7 +7231,7 @@ mod tests {
handler_block: BlockIdx::new(5),
preserve_lasti: false,
};
let mut blocks = vec![Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default()]);
let mut stale = test_instr(Instruction::Nop, 41);
stale.except_handler = Some(handler);
test_block_push(&mut blocks[0], stale);
Expand All @@ -7255,7 +7255,7 @@ mod tests {

assert_eq!(info.target, BlockIdx::new(1));

let mut blocks = vec![Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default()]);
test_block_push(&mut blocks[0], info);
blocks[0].next = BlockIdx::new(1);

Expand All @@ -7270,7 +7270,7 @@ mod tests {
fn cfg_to_instruction_sequence_requires_target_for_target_opcodes() {
let mut block = Block::default();
test_block_push(&mut block, test_jump(BlockIdx::NULL, 51));
let mut blocks = vec![block];
let mut blocks = Blocks::from([block]);

let mut instr_sequence = instruction_sequence_new();
let _ = cfg_to_instruction_sequence(&mut blocks, &mut instr_sequence);
Expand Down Expand Up @@ -7468,7 +7468,7 @@ mod tests {
#[test]
fn resolve_line_numbers_duplicates_exit_blocks_like_cpython() {
let exit = BlockIdx::new(2);
let mut blocks = vec![Block::default(), Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]);
blocks[0].cpython_label = InstructionSequenceLabel::from_index(0);
blocks[1].cpython_label = InstructionSequenceLabel::from_index(1);
blocks[2].cpython_label = InstructionSequenceLabel::from_index(2);
Expand Down Expand Up @@ -7506,7 +7506,7 @@ mod tests {
block.instructions[1].lineno_override = Some(NEXT_LOCATION_OVERRIDE);
test_block_push(&mut block, test_instr(Instruction::ReturnValue, 30));
block.instructions[2].lineno_override = Some(NO_LOCATION_OVERRIDE);
let mut blocks = vec![block];
let mut blocks = [block].into();

remove_unreachable(&mut blocks).expect("remove_unreachable succeeds");
propagate_line_numbers(&mut blocks);
Expand All @@ -7527,7 +7527,7 @@ mod tests {

#[test]
fn propagate_line_numbers_updates_empty_jump_target_raw_slot_like_cpython() {
let mut blocks = vec![Block::default(), Block::default(), Block::default()];
let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]);
blocks[0].next = BlockIdx::new(2);
test_block_push(&mut blocks[0], test_cond_jump(BlockIdx::new(1), 10));
test_block_push(&mut blocks[1], test_instr(Instruction::Nop, 20));
Expand Down Expand Up @@ -7561,12 +7561,12 @@ mod tests {

#[test]
fn jump_threading_rechecks_new_jump_like_cpython() {
let mut blocks = vec![
let mut blocks = Blocks::from([
Block::default(),
Block::default(),
Block::default(),
Block::default(),
];
]);
for (i, block) in blocks.iter_mut().enumerate() {
block.cpython_label = InstructionSequenceLabel::from_index(i as i32);
}
Expand Down
Back | FazBrowse Home | New Git URL