bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

mir: Run drop elaboration on constant MIR

Browse source 
Seems to Just Work since miri merged.
This commit is contained in:
Nick Fitzgerald 2018-04-27 06:36:46 -07:00
parent 937f9bac5d
commit eb2582e8e1
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_mir/transform/elaborate_drops.rs
View file

@ -15,7 +15,6 @@ use dataflow::{on_all_children_bits, on_all_drop_children_bits};
use dataflow::{drop_flag_effects_for_location, on_lookup_result_bits}; use dataflow::{drop_flag_effects_for_location, on_lookup_result_bits};
use dataflow::MoveDataParamEnv; use dataflow::MoveDataParamEnv;
use dataflow::{self, do_dataflow, DebugFormatted}; use dataflow::{self, do_dataflow, DebugFormatted};
use rustc::hir;
use rustc::ty::{self, TyCtxt}; use rustc::ty::{self, TyCtxt};
use rustc::mir::*; use rustc::mir::*;
use rustc::middle::const_val::ConstVal; use rustc::middle::const_val::ConstVal;
@ -42,14 +41,7 @@ impl MirPass for ElaborateDrops {
{ {
debug!("elaborate_drops({:?} @ {:?})", src, mir.span); debug!("elaborate_drops({:?} @ {:?})", src, mir.span);
// Don't run on constant MIR, because trans might not be able to
// evaluate the modified MIR.
// FIXME(eddyb) Remove check after miri is merged.
let id = tcx.hir.as_local_node_id(src.def_id).unwrap(); let id = tcx.hir.as_local_node_id(src.def_id).unwrap();
match (tcx.hir.body_owner_kind(id), src.promoted) {
(hir::BodyOwnerKind::Fn, None) => {},
_ => return
}
let param_env = tcx.param_env(src.def_id).with_reveal_all(); let param_env = tcx.param_env(src.def_id).with_reveal_all();
let move_data = MoveData::gather_moves(mir, tcx).unwrap(); let move_data = MoveData::gather_moves(mir, tcx).unwrap();
let elaborate_patch = { let elaborate_patch = {