Skip to content

Commit a1798ce

Browse files
committed
use intoiterator on populate_blocks and rename rpo var
1 parent 52a4490 commit a1798ce

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

compiler/noirc_evaluator/src/ssa/opt/normalize_value_ids.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ impl Context {
7676
new_function.dfg.make_global(value.get_type().into_owned());
7777
}
7878

79-
let reachable_blocks = old_function.reachable_blocks().into_iter().collect::<Vec<_>>();
80-
self.new_ids.populate_blocks(&reachable_blocks, old_function, new_function);
79+
let reachable_blocks = old_function.reachable_blocks();
80+
self.new_ids.populate_blocks(reachable_blocks, old_function, new_function);
8181

82-
let mut rpo = PostOrder::with_function(old_function).into_vec();
83-
rpo.reverse();
82+
let mut reverse_post_order = PostOrder::with_function(old_function).into_vec();
83+
reverse_post_order.reverse();
8484

8585
// Map each parameter, instruction, and terminator
86-
for old_block_id in rpo {
86+
for old_block_id in reverse_post_order {
8787
let new_block_id = self.new_ids.blocks[&old_block_id];
8888

8989
let old_block = &mut old_function.dfg[old_block_id];
@@ -140,21 +140,21 @@ impl Context {
140140
impl IdMaps {
141141
fn populate_blocks(
142142
&mut self,
143-
reachable_blocks: &[BasicBlockId],
143+
reachable_blocks: impl IntoIterator<Item = BasicBlockId>,
144144
old_function: &mut Function,
145145
new_function: &mut Function,
146146
) {
147147
let old_entry = old_function.entry_block();
148148
self.blocks.insert(old_entry, new_function.entry_block());
149149

150150
for old_id in reachable_blocks {
151-
if *old_id != old_entry {
151+
if old_id != old_entry {
152152
let new_id = new_function.dfg.make_block();
153-
self.blocks.insert(*old_id, new_id);
153+
self.blocks.insert(old_id, new_id);
154154
}
155155

156-
let new_id = self.blocks[old_id];
157-
let old_block = &mut old_function.dfg[*old_id];
156+
let new_id = self.blocks[&old_id];
157+
let old_block = &mut old_function.dfg[old_id];
158158
for old_parameter in old_block.take_parameters() {
159159
let old_parameter = old_function.dfg.resolve(old_parameter);
160160
let typ = old_function.dfg.type_of_value(old_parameter);

0 commit comments

Comments
 (0)