Replace with new Place in mir/borrowck

Author: csmoe

src/librustc/mir/mod.rs

@@ -1826,6 +1826,13 @@ impl<'a, 'tcx> Place<'tcx> {
             elems: tcx.intern_place_elems(&[elem]),
         }
     }
+
+    pub fn local(local: Local) -> Self {
+       Place {
+           base: PlaceBase::Local(local),
+           elems: Slice::empty(),
+       }
+    }
 }
 
 impl<'tcx> Debug for PlaceBase<'tcx> {

src/librustc/mir/tcx.rs

@@ -146,14 +146,14 @@ impl<'tcx> Place<'tcx> {
         let mut place = self;
         let mut by_ref = false;
 
-        base_place = place.base_place(tcx);
+        base_place = place.base_place(*tcx);
 
         if let Some(ProjectionElem::Deref) = place.projection() {
             place = &base_place;
             by_ref = true;
         }
         if let Some(ProjectionElem::Field(field, _ty)) = place.projection() {
-            let base_ty = place.base_place(tcx).ty(mir, *tcx).to_ty(*tcx);
+            let base_ty = place.base_place(*tcx).ty(mir, *tcx).to_ty(*tcx);
 
             if base_ty.is_closure() || base_ty.is_generator()
                 && (!(by_ref && !mir.upvar_decls[field.index()].by_ref)) {
@@ -174,7 +174,7 @@ impl<'tcx> Place<'tcx> {
     //     |-- base_place
     pub fn split_projection<'cx, 'gcx>(
         &self,
-        tcx: &TyCtxt<'cx, 'gcx, 'tcx>,
+        tcx: TyCtxt<'cx, 'gcx, 'tcx>,
     ) -> Option<(Place<'tcx>, &PlaceElem<'tcx>)> {
         // split place_elems
         // Base.[a, b, c]
@@ -200,7 +200,7 @@ impl<'tcx> Place<'tcx> {
     //          ^^-- no projection
     pub fn base_place<'cx, 'gcx>(
         &self,
-        tcx: &TyCtxt<'cx, 'gcx, 'tcx>,
+        tcx: TyCtxt<'cx, 'gcx, 'tcx>,
     ) -> Place<'tcx> {
         match self.split_projection(tcx) {
             Some((place, _)) => place,

src/librustc_mir/borrow_check/borrow_set.rs

@@ -12,7 +12,7 @@ use borrow_check::place_ext::PlaceExt;
 use dataflow::indexes::BorrowIndex;
 use rustc::mir::traversal;
 use rustc::mir::visit::{PlaceContext, Visitor};
-use rustc::mir::{self, Location, Mir, Place};
+use rustc::mir::{self, Location, Mir, Place, PlaceBase};
 use rustc::ty::{Region, TyCtxt};
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::indexed_vec::IndexVec;
@@ -177,7 +177,7 @@ impl<'a, 'gcx, 'tcx> Visitor<'tcx> for GatherBorrows<'a, 'gcx, 'tcx> {
             self.insert_as_pending_if_two_phase(location, &assigned_place, region, kind, idx);
 
             insert(&mut self.region_map, &region, idx);
-            if let Some(local) = borrowed_place.root_local() {
+            if let Some(local) = borrowed_place.root_local(self.tcx) {
                 insert(&mut self.local_map, &local, idx);
             }
         }
@@ -202,7 +202,10 @@ impl<'a, 'gcx, 'tcx> Visitor<'tcx> for GatherBorrows<'a, 'gcx, 'tcx> {
         self.super_place(place, context, location);
 
         // We found a use of some temporary TEMP...
-        if let Place::Local(temp) = place {
+        if let Place {
+            base: PlaceBase::Local(temp),
+            elems: _,
+        } = place {
             // ... check whether we (earlier) saw a 2-phase borrow like
             //
             //     TMP = &mut place
@@ -254,7 +257,6 @@ impl<'a, 'gcx, 'tcx> Visitor<'tcx> for GatherBorrows<'a, 'gcx, 'tcx> {
                         }
                     };
                 }
-
                 None => {}
             }
         }
@@ -321,7 +323,7 @@ impl<'a, 'gcx, 'tcx> GatherBorrows<'a, 'gcx, 'tcx> {
         //    TEMP = &foo
         //
         // so extract `temp`.
-        let temp = if let &mir::Place::Local(temp) = assigned_place {
+        let temp = if let mir::PlaceBase::Local(temp) = assigned_place.base {
             temp
         } else {
             span_bug!(