Skip to content

Fix all clippy suggestions in ir.rs #8162

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 30, 2026
+94 −117
Merged

Fix all clippy suggestions in ir.rs #8162

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7564087
Fix all clippy suggestions in `ir.rs`
ShaharNaveh Jun 25, 2026
4db90b2
remove some `idx()` calls
ShaharNaveh Jun 25, 2026
d5b89f6
Merge remote-tracking branch 'upstream/main' into ir-cleanup-clippy
ShaharNaveh Jun 26, 2026
86a6360
fix after merge
ShaharNaveh Jun 26, 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
remove some idx() calls
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jun 25, 2026
commit 4db90b25f809dcdee1486ed2998b92209bc03439
31 changes: 15 additions & 16 deletions crates/codegen/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6118,7 +6118,7 @@ fn cfg_builder_check_size(g: &CfgBuilder) -> crate::InternalResult<()> {
while block != BlockIdx::NULL {
debug_assert!(block.idx() < g.blocks.len());
nblocks += 1;
block = g.blocks[block.idx()].allocation_next;
block = g.blocks[block].allocation_next;
}
debug_assert_eq!(nblocks, g.blocks.len());
if nblocks > usize::MAX / core::mem::size_of::<usize>() {
Expand Down Expand Up @@ -6258,13 +6258,12 @@ fn maybe_push(
) {
debug_assert!(block != BlockIdx::NULL);

let idx = block.idx();
let both = blocks[idx].unsafe_locals_mask | unsafe_mask;
if blocks[idx].unsafe_locals_mask != both {
blocks[idx].unsafe_locals_mask = both;
if !blocks[idx].visited {
let both = blocks[block].unsafe_locals_mask | unsafe_mask;
if blocks[block].unsafe_locals_mask != both {
blocks[block].unsafe_locals_mask = both;
if !blocks[block].visited {
worklist.push(block);
blocks[idx].visited = true;
blocks[block].visited = true;
}
}
}
Expand Down Expand Up @@ -6351,8 +6350,8 @@ fn fast_scan_many_locals(blocks: &mut Blocks, nlocals: usize) -> crate::Internal
let mut current = BlockIdx(0);
while current != BlockIdx::NULL {
blocknum += 1;
for i in 0..blocks[current.idx()].instruction_used {
let info = &mut blocks[current.idx()].instructions[i];
for i in 0..blocks[current].instruction_used {
let info = &mut blocks[current].instructions[i];
debug_assert!(!matches!(info.instr.real(), Some(Instruction::ExtendedArg)));
let arg = u32::from(info.arg) as usize;
if arg < LOCAL_UNSAFE_MASK_BITS {
Expand Down Expand Up @@ -6381,7 +6380,7 @@ fn fast_scan_many_locals(blocks: &mut Blocks, nlocals: usize) -> crate::Internal
_ => {}
}
}
current = blocks[current.idx()].next;
current = blocks[current].next;
}
Ok(())
}
Expand Down Expand Up @@ -6411,11 +6410,11 @@ fn add_checks_for_loads_of_uninitialized_variables(
let mut current = BlockIdx(0);
while current != BlockIdx::NULL {
scan_block_for_locals(blocks, current, &mut worklist);
current = blocks[current.idx()].next;
current = blocks[current].next;
}

while let Some(block_idx) = worklist.pop() {
blocks[block_idx.idx()].visited = false;
blocks[block_idx].visited = false;
scan_block_for_locals(blocks, block_idx, &mut worklist);
}
Ok(())
Expand Down Expand Up @@ -6527,9 +6526,9 @@ fn get_max_label(blocks: &Blocks) -> i32 {
let mut lbl = -1;
let mut current = BlockIdx(0);
while current != BlockIdx::NULL {
let cpython_label = blocks[current.idx()].cpython_label;
let cpython_label = blocks[current].cpython_label;
lbl = lbl.max(cpython_label.0);
current = blocks[current.idx()].next;
current = blocks[current].next;
}
lbl
}
Expand Down Expand Up @@ -6708,8 +6707,8 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes
pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<()> {
let mut block_idx = BlockIdx(0);
while block_idx != BlockIdx::NULL {
let next = blocks[block_idx.idx()].next;
let block = &mut blocks[block_idx.idx()];
let next = blocks[block_idx].next;
let block = &mut blocks[block_idx];
for i in 0..block.instruction_used {
let info = &mut block.instructions[i];
if is_block_push(info) {
Expand Down
Loading