Skip to content

Commit eb2582e

Browse files
committed
mir: Run drop elaboration on constant MIR
Seems to Just Work since miri merged.
1 parent 937f9ba commit eb2582e

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/librustc_mir/transform/elaborate_drops.rs

-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use dataflow::{on_all_children_bits, on_all_drop_children_bits};
1515
use dataflow::{drop_flag_effects_for_location, on_lookup_result_bits};
1616
use dataflow::MoveDataParamEnv;
1717
use dataflow::{self, do_dataflow, DebugFormatted};
18-
use rustc::hir;
1918
use rustc::ty::{self, TyCtxt};
2019
use rustc::mir::*;
2120
use rustc::middle::const_val::ConstVal;
@@ -42,14 +41,7 @@ impl MirPass for ElaborateDrops {
4241
{
4342
debug!("elaborate_drops({:?} @ {:?})", src, mir.span);
4443

45-
// Don't run on constant MIR, because trans might not be able to
46-
// evaluate the modified MIR.
47-
// FIXME(eddyb) Remove check after miri is merged.
4844
let id = tcx.hir.as_local_node_id(src.def_id).unwrap();
49-
match (tcx.hir.body_owner_kind(id), src.promoted) {
50-
(hir::BodyOwnerKind::Fn, None) => {},
51-
_ => return
52-
}
5345
let param_env = tcx.param_env(src.def_id).with_reveal_all();
5446
let move_data = MoveData::gather_moves(mir, tcx).unwrap();
5547
let elaborate_patch = {

0 commit comments

Comments
 (0)