@@ -76,14 +76,14 @@ impl Context {
76
76
new_function. dfg . make_global ( value. get_type ( ) . into_owned ( ) ) ;
77
77
}
78
78
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) ;
81
81
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 ( ) ;
84
84
85
85
// Map each parameter, instruction, and terminator
86
- for old_block_id in rpo {
86
+ for old_block_id in reverse_post_order {
87
87
let new_block_id = self . new_ids . blocks [ & old_block_id] ;
88
88
89
89
let old_block = & mut old_function. dfg [ old_block_id] ;
@@ -140,21 +140,21 @@ impl Context {
140
140
impl IdMaps {
141
141
fn populate_blocks (
142
142
& mut self ,
143
- reachable_blocks : & [ BasicBlockId ] ,
143
+ reachable_blocks : impl IntoIterator < Item = BasicBlockId > ,
144
144
old_function : & mut Function ,
145
145
new_function : & mut Function ,
146
146
) {
147
147
let old_entry = old_function. entry_block ( ) ;
148
148
self . blocks . insert ( old_entry, new_function. entry_block ( ) ) ;
149
149
150
150
for old_id in reachable_blocks {
151
- if * old_id != old_entry {
151
+ if old_id != old_entry {
152
152
let new_id = new_function. dfg . make_block ( ) ;
153
- self . blocks . insert ( * old_id, new_id) ;
153
+ self . blocks . insert ( old_id, new_id) ;
154
154
}
155
155
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] ;
158
158
for old_parameter in old_block. take_parameters ( ) {
159
159
let old_parameter = old_function. dfg . resolve ( old_parameter) ;
160
160
let typ = old_function. dfg . type_of_value ( old_parameter) ;
0 commit comments