generate tys of sub-places

Author: csmoe

src/librustc/mir/mod.rs

@@ -2129,7 +2129,7 @@ impl<'tcx> NeoPlace<'tcx> {
         self,
         tcx: TyCtxt<'_, '_, 'tcx>,
         adt_def: &'tcx AdtDef,
-        variant_index: usize,
+        variant_index: VariantIdx,
     ) -> Self {
         self.elem(tcx, ProjectionElem::Downcast(adt_def, variant_index))
     }
@@ -3619,7 +3619,9 @@ where
     V: TypeFoldable<'tcx>,
     T: TypeFoldable<'tcx>,
 {
-    fn super_fold_with<'gcx: 'tcx, F: TypeFolder<'gcx, 'tcx>>(&self, folder: &mut F) -> Self {
+    default fn super_fold_with<'gcx: 'tcx, F>(&self, folder: &mut F) -> Self
+        where F: TypeFolder<'gcx, 'tcx>
+    {
         use self::ProjectionElem::*;
         match self {
             Deref => Deref,
@@ -3629,7 +3631,7 @@ where
         }
     }
 
-    fn super_visit_with<Vs: TypeVisitor<'tcx>>(&self, visitor: &mut Vs) -> bool {
+    default fn super_visit_with<Vs: TypeVisitor<'tcx>>(&self, visitor: &mut Vs) -> bool {
         use self::ProjectionElem::*;
         match self {
             Field(_, ty) => ty.visit_with(visitor),

src/librustc/mir/tcx.rs

@@ -334,6 +334,29 @@ impl<'tcx> NeoPlace<'tcx> {
             }
         }
     }
+
+    // Generate types of sub-places
+    //
+    // Base.[a, b]
+    // ^^^^-- base_ty
+    // ^^^^^^^-- elem1_ty
+    // ^^^^^^^^^^--elem2_ty
+    //
+    // [base_ty, elem1_ty, elem2_ty]
+    pub fn place_tys<'cx, 'gcx>(
+        &self,
+        mir: &'cx Mir<'tcx>,
+        tcx: TyCtxt<'cx, 'gcx, 'tcx>,
+    ) -> Vec<PlaceTy<'tcx>> {
+        let mut base_ty = PlaceTy::from(self.base.ty(mir));
+        let mut place_tys: Vec<PlaceTy<'tcx>> = vec![base_ty];
+        for elem in self.elems.iter() {
+            let elem_ty = base_ty.projection_ty(tcx, elem);
+            place_tys.push(elem_ty);
+            base_ty = elem_ty;
+        }
+        place_tys
+    }
 }
 
 pub enum RvalueInitializationState {

src/librustc/mir/visit.rs

@@ -788,7 +788,6 @@ macro_rules! make_mir_visitor {
                     for elem in elems.iter().cloned().rev() {
                         self.visit_projection_elem(
                             &$($mutability)* elem.clone(),
-                            context,
                             location
                         );
                     }

src/librustc_mir/borrow_check/borrow_set.rs

@@ -8,6 +8,13 @@ use rustc::mir::visit::{
 };
 use rustc::mir::{self, Location, Mir, Local};
 use rustc::ty::{RegionVid, TyCtxt};
+<<<<<<< HEAD
+||||||| merged common ancestors
+use rustc::mir::PlaceBase;
+use rustc::ty::{RegionVid, TyCtxt};
+=======
+use rustc::mir::PlaceBase;
+>>>>>>> generate tys of sub-places
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::indexed_vec::IndexVec;
 use rustc_data_structures::bit_set::BitSet;

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

@@ -1096,7 +1096,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
         );
 
         let annotated_type = self.mir.user_type_annotations[user_ty.base].inferred_ty;
-        let mut curr_projected_ty = PlaceTy::from_ty(annotated_type);
+        let mut curr_projected_ty = PlaceTy::from(annotated_type);
 
         let tcx = self.infcx.tcx;