rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor call terminator to always hold a destination place

Browse Source
This commit is contained in:
Jakob Degen
2022-04-16 09:27:54 -04:00
parent 222c5724ec
commit 09b0936db2
67 changed files with 422 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/rustc_mir_dataflow/src/framework/direction.rs
View File

@@ -237,14 +237,12 @@ impl Direction for Backward {
// Apply terminator-specific edge effects.
//
// FIXME(ecstaticmorse): Avoid cloning the exit state unconditionally.
mir::TerminatorKind::Call { destination: Some((return_place, dest)), .. }
if dest == bb =>
{
mir::TerminatorKind::Call { destination, target: Some(dest), .. } if dest == bb => {
let mut tmp = exit_state.clone();
analysis.apply_call_return_effect(
&mut tmp,
pred,
CallReturnPlaces::Call(return_place),
CallReturnPlaces::Call(destination),
);
propagate(pred, &tmp);
}
@@ -532,20 +530,28 @@ impl Direction for Forward {
propagate(target, exit_state);
}
Call { cleanup, destination, func: _, args: _, from_hir_call: _, fn_span: _ } => {
Call {
cleanup,
destination,
target,
func: _,
args: _,
from_hir_call: _,
fn_span: _,
} => {
if let Some(unwind) = cleanup {
if dead_unwinds.map_or(true, |dead| !dead.contains(bb)) {
propagate(unwind, exit_state);
}
}
if let Some((dest_place, target)) = destination {
if let Some(target) = target {
// N.B.: This must be done *last*, otherwise the unwind path will see the call
// return effect.
analysis.apply_call_return_effect(
exit_state,
bb,
CallReturnPlaces::Call(dest_place),
CallReturnPlaces::Call(destination),
);
propagate(target, exit_state);
}