bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

mir: Deaggregate constant MIR

Browse source 
Appears to work now that miri has merged.
This commit is contained in:
Nick Fitzgerald 2018-04-27 06:42:45 -07:00
parent eb2582e8e1
commit 1129a711a6
1 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/librustc_mir/transform/deaggregator.rs
View file

@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
use rustc::hir;
use rustc::ty::TyCtxt; use rustc::ty::TyCtxt;
use rustc::mir::*; use rustc::mir::*;
use rustc_data_structures::indexed_vec::Idx; use rustc_data_structures::indexed_vec::Idx;
@ -19,26 +18,8 @@ pub struct Deaggregator;
impl MirPass for Deaggregator { impl MirPass for Deaggregator {
fn run_pass<'a, 'tcx>(&self, fn run_pass<'a, 'tcx>(&self,
tcx: TyCtxt<'a, 'tcx, 'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>,
source: MirSource, _source: MirSource,
mir: &mut Mir<'tcx>) { mir: &mut Mir<'tcx>) {
// 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(source.def_id).unwrap();
match (tcx.hir.body_owner_kind(id), source.promoted) {
(_, Some(_)) |
(hir::BodyOwnerKind::Const, _) |
(hir::BodyOwnerKind::Static(_), _) => return,
(hir::BodyOwnerKind::Fn, _) => {
if tcx.is_const_fn(source.def_id) {
// Don't run on const functions, as, again, trans might not be able to evaluate
// the optimized IR.
return
}
}
}
let (basic_blocks, local_decls) = mir.basic_blocks_and_local_decls_mut(); let (basic_blocks, local_decls) = mir.basic_blocks_and_local_decls_mut();
let local_decls = &*local_decls; let local_decls = &*local_decls;
for bb in basic_blocks { for bb in basic_blocks {