bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Specify that method only applies statement effects.

Browse source
This commit is contained in:
Camille GILLOT 2023-05-27 17:11:59 +00:00
parent aa697f599e
commit 7ded3409b8
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir_dataflow/src/framework/direction.rs
View file

@ -33,7 +33,7 @@ pub trait Direction {
where where
A: Analysis<'tcx>; A: Analysis<'tcx>;
fn gen_kill_effects_in_block<'tcx, A>( fn gen_kill_statement_effects_in_block<'tcx, A>(
analysis: &mut A, analysis: &mut A,
trans: &mut GenKillSet<A::Idx>, trans: &mut GenKillSet<A::Idx>,
block: BasicBlock, block: BasicBlock,
@ -93,7 +93,7 @@ impl Direction for Backward {
edges edges
} }
fn gen_kill_effects_in_block<'tcx, A>( fn gen_kill_statement_effects_in_block<'tcx, A>(
analysis: &mut A, analysis: &mut A,
trans: &mut GenKillSet<A::Idx>, trans: &mut GenKillSet<A::Idx>,
block: BasicBlock, block: BasicBlock,
@ -350,7 +350,7 @@ impl Direction for Forward {
analysis.apply_terminator_effect(state, terminator, location) analysis.apply_terminator_effect(state, terminator, location)
} }
fn gen_kill_effects_in_block<'tcx, A>( fn gen_kill_statement_effects_in_block<'tcx, A>(
analysis: &mut A, analysis: &mut A,
trans: &mut GenKillSet<A::Idx>, trans: &mut GenKillSet<A::Idx>,
block: BasicBlock, block: BasicBlock,

17
compiler/rustc_mir_dataflow/src/framework/engine.rs
View file

@ -144,7 +144,7 @@ where
// gen/kill problems on cyclic CFGs. This is not ideal, but it doesn't seem to degrade // gen/kill problems on cyclic CFGs. This is not ideal, but it doesn't seem to degrade
// performance in practice. I've tried a few ways to avoid this, but they have downsides. See // performance in practice. I've tried a few ways to avoid this, but they have downsides. See
// the message for the commit that added this FIXME for more information. // the message for the commit that added this FIXME for more information.
apply_trans_for_block: Option<Box<dyn Fn(BasicBlock, &mut A::Domain)>>, apply_statement_trans_for_block: Option<Box<dyn Fn(BasicBlock, &mut A::Domain)>>,
} }
impl<'a, 'tcx, A, D, T> Engine<'a, 'tcx, A> impl<'a, 'tcx, A, D, T> Engine<'a, 'tcx, A>
@ -170,7 +170,12 @@ where
for (block, block_data) in body.basic_blocks.iter_enumerated() { for (block, block_data) in body.basic_blocks.iter_enumerated() {
let trans = &mut trans_for_block[block]; let trans = &mut trans_for_block[block];
A::Direction::gen_kill_effects_in_block(&mut analysis, trans, block, block_data); A::Direction::gen_kill_statement_effects_in_block(
&mut analysis,
trans,
block,
block_data,
);
} }
let apply_trans = Box::new(move |bb: BasicBlock, state: &mut A::Domain| { let apply_trans = Box::new(move |bb: BasicBlock, state: &mut A::Domain| {
@ -199,7 +204,7 @@ where
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
body: &'a mir::Body<'tcx>, body: &'a mir::Body<'tcx>,
analysis: A, analysis: A,
apply_trans_for_block: Option<Box<dyn Fn(BasicBlock, &mut A::Domain)>>, apply_statement_trans_for_block: Option<Box<dyn Fn(BasicBlock, &mut A::Domain)>>,
) -> Self { ) -> Self {
let mut entry_sets = let mut entry_sets =
IndexVec::from_fn_n(|_| analysis.bottom_value(body), body.basic_blocks.len()); IndexVec::from_fn_n(|_| analysis.bottom_value(body), body.basic_blocks.len());
@ -210,7 +215,7 @@ where
bug!("`initialize_start_block` is not yet supported for backward dataflow analyses"); bug!("`initialize_start_block` is not yet supported for backward dataflow analyses");
} }
Engine { analysis, tcx, body, pass_name: None, entry_sets, apply_trans_for_block } Engine { analysis, tcx, body, pass_name: None, entry_sets, apply_statement_trans_for_block }
} }
/// Adds an identifier to the graphviz output for this particular run of a dataflow analysis. /// Adds an identifier to the graphviz output for this particular run of a dataflow analysis.
@ -232,7 +237,7 @@ where
body, body,
mut entry_sets, mut entry_sets,
tcx, tcx,
apply_trans_for_block, apply_statement_trans_for_block,
pass_name, pass_name,
.. ..
} = self; } = self;
@ -269,7 +274,7 @@ where
&mut state, &mut state,
bb, bb,
bb_data, bb_data,
apply_trans_for_block.as_deref(), apply_statement_trans_for_block.as_deref(),
); );
A::Direction::join_state_into_successors_of( A::Direction::join_state_into_successors_of(