bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cleanup cfg after optimization

Browse source
This commit is contained in:
Simon Vandel Sillesen 2020-09-19 15:21:39 +02:00
parent f472303a93
commit b6f51d6d6a
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir/src/transform/remove_unneeded_drops.rs
View file

@ -6,6 +6,8 @@ use rustc_middle::mir::visit::Visitor;
use rustc_middle::mir::*;
use rustc_middle::ty::TyCtxt;
use super::simplify::simplify_cfg;
pub struct RemoveUnneededDrops;
impl<'tcx> MirPass<'tcx> for RemoveUnneededDrops {
@ -18,11 +20,18 @@ impl<'tcx> MirPass<'tcx> for RemoveUnneededDrops {
def_id: source.def_id().expect_local(),
};
opt_finder.visit_body(body);
let should_simplify = !opt_finder.optimizations.is_empty();
for (loc, target) in opt_finder.optimizations {
let terminator = body.basic_blocks_mut()[loc.block].terminator_mut();
debug!("SUCCESS: replacing `drop` with goto({:?})", target);
terminator.kind = TerminatorKind::Goto { target };
}
// if we applied optimizations, we potentially have some cfg to cleanup to
// make it easier for further passes
if should_simplify {
simplify_cfg(body);
}
}
}