Skip to content

Commit 517b767

Browse files
committed
Reorder args for visit_results_in_block.
Put `analysis` first, to match `apply_effects_in_range`.
1 parent 958a2e4 commit 517b767

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler/rustc_mir_dataflow/src/framework/direction.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ pub trait Direction {
4040
/// all locations in a basic block (starting from `entry_state` and to
4141
/// visit them with `vis`.
4242
fn visit_results_in_block<'mir, 'tcx, A>(
43+
analysis: &mut A,
4344
state: &mut A::Domain,
4445
block: BasicBlock,
4546
block_data: &'mir mir::BasicBlockData<'tcx>,
46-
analysis: &mut A,
4747
vis: &mut impl ResultsVisitor<'tcx, A>,
4848
) where
4949
A: Analysis<'tcx>;
@@ -206,10 +206,10 @@ impl Direction for Backward {
206206
}
207207

208208
fn visit_results_in_block<'mir, 'tcx, A>(
209+
analysis: &mut A,
209210
state: &mut A::Domain,
210211
block: BasicBlock,
211212
block_data: &'mir mir::BasicBlockData<'tcx>,
212-
analysis: &mut A,
213213
vis: &mut impl ResultsVisitor<'tcx, A>,
214214
) where
215215
A: Analysis<'tcx>,
@@ -386,10 +386,10 @@ impl Direction for Forward {
386386
}
387387

388388
fn visit_results_in_block<'mir, 'tcx, A>(
389+
analysis: &mut A,
389390
state: &mut A::Domain,
390391
block: BasicBlock,
391392
block_data: &'mir mir::BasicBlockData<'tcx>,
392-
analysis: &mut A,
393393
vis: &mut impl ResultsVisitor<'tcx, A>,
394394
) where
395395
A: Analysis<'tcx>,

compiler/rustc_mir_dataflow/src/framework/visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn visit_results<'mir, 'tcx, A>(
2424

2525
let block_data = &body[block];
2626
state.clone_from(&results[block]);
27-
A::Direction::visit_results_in_block(&mut state, block, block_data, analysis, vis);
27+
A::Direction::visit_results_in_block(analysis, &mut state, block, block_data, vis);
2828
}
2929
}
3030

0 commit comments

Comments
 (0)