convert LocalWithRegion to Local

Author: Dylan-DPC

src/librustc_mir/borrow_check/nll/mod.rs

@@ -30,7 +30,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use std::str::FromStr;
 use transform::MirSource;
-use util::liveness::{IdentityMap, LivenessResults, LocalSet, NllLivenessMap};
+use util::liveness::{LivenessResults, LocalSet, NllLivenessMap};
 
 use self::mir_util::PassWhere;
 use polonius_engine::{Algorithm, Output};
@@ -220,7 +220,7 @@ fn dump_mir_results<'a, 'gcx, 'tcx>(
         return;
     }
 
-    let map = &IdentityMap::new(mir);
+    let map = &NllLivenessMap::compute(mir);
 
     let regular_liveness_per_location: FxHashMap<_, _> = mir
         .basic_blocks()

src/librustc_mir/borrow_check/nll/type_check/liveness.rs

@@ -13,15 +13,15 @@ use dataflow::move_paths::{HasMoveData, MoveData};
 use dataflow::MaybeInitializedPlaces;
 use dataflow::{FlowAtLocation, FlowsAtLocation};
 use rustc::infer::canonical::QueryRegionConstraint;
-use rustc::mir::{Local, LocalWithRegion};
+use rustc::mir::LocalWithRegion;
 use rustc::mir::{BasicBlock, Location, Mir};
 use rustc::traits::query::dropck_outlives::DropckOutlivesResult;
 use rustc::traits::query::type_op::outlives::DropckOutlives;
 use rustc::traits::query::type_op::TypeOp;
 use rustc::ty::{Ty, TypeFoldable};
 use rustc_data_structures::fx::FxHashMap;
 use std::rc::Rc;
-use util::liveness::{IdentityMap, LivenessResults};
+use util::liveness::{NllLivenessMap, LivenessResults, LiveVariableMap };
 
 use super::TypeChecker;
 
@@ -47,7 +47,7 @@ pub(super) fn generate<'gcx, 'tcx>(
         flow_inits,
         move_data,
         drop_data: FxHashMap(),
-        map: &IdentityMap::new(mir),
+        map: &NllLivenessMap::compute(mir),
     };
 
     for bb in mir.basic_blocks().indices() {
@@ -68,7 +68,7 @@ where
     flow_inits: &'gen mut FlowAtLocation<MaybeInitializedPlaces<'flow, 'gcx, 'tcx>>,
     move_data: &'gen MoveData<'tcx>,
     drop_data: FxHashMap<Ty<'tcx>, DropData<'tcx>>,
-    map: &'gen IdentityMap<'gen, 'tcx>,
+    map: &'gen NllLivenessMap,
 }
 
 struct DropData<'tcx> {
@@ -88,7 +88,8 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
             .regular
             .simulate_block(self.mir, bb, self.map, |location, live_locals| {
                 for live_local in live_locals.iter() {
-                    let live_local_ty = self.mir.local_decls[live_local].ty;
+                    let local = self.map.from_live_var(live_local);
+                    let live_local_ty = self.mir.local_decls[local].ty;
                     Self::push_type_live_constraint(&mut self.cx, live_local_ty, location);
                 }
             });
@@ -123,15 +124,17 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
                     });
                 }
 
-                let mpi = self.move_data.rev_lookup.find_local(live_local);
+                let local = self.map.from_live_var(live_local);
+                let mpi = self.move_data.rev_lookup.find_local(local);
                 if let Some(initialized_child) = self.flow_inits.has_any_child_of(mpi) {
                     debug!(
                         "add_liveness_constraints: mpi={:?} has initialized child {:?}",
                         self.move_data.move_paths[mpi],
                         self.move_data.move_paths[initialized_child]
                     );
 
-                    let live_local_ty = self.mir.local_decls[live_local].ty;
+                    let local = self.map.from_live_var(live_local);
+                    let live_local_ty = self.mir.local_decls[local].ty;
                     self.add_drop_live_constraint(live_local, live_local_ty, location);
                 }
             }

src/librustc_mir/util/liveness.rs

@@ -570,7 +570,7 @@ impl LiveVariableMap for NllLivenessMap {
 impl NllLivenessMap {
     pub fn compute(mir: &Mir) -> Self {
         let mut to_local = IndexVec::default();
-        let from_local: IndexVec<_,_> = mir.local.decls.iter_enumerated.map(|local, local_decl| {
+        let from_local: IndexVec<Local,Option<_>> = mir.local_decls.iter_enumerated().map(|(local, local_decl)| {
             if local_decl.ty.has_free_regions() {
                 Some(to_local.push(local))
             }