rustc: rename mir::LocalDecl's source_info to visibility_source_info.

eddyb · eddyb · commit 0895590c5391 · 2018-05-30T20:30:10.000+03:00
diff --git a/src/librustc/ich/impls_mir.rs b/src/librustc/ich/impls_mir.rs
@@ -25,8 +25,8 @@ impl_stable_hash_for!(struct mir::LocalDecl<'tcx> {
     mutability,
     ty,
     name,
-    source_info,
     syntactic_source_info,
+    visibility_source_info,
     internal,
     is_user_variable
 });
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
@@ -505,10 +505,6 @@ pub struct LocalDecl<'tcx> {
     /// to generate better debuginfo.
     pub name: Option<Name>,
 
-    /// Source info of the local. The `SourceScope` is the *visibility* one,
-    /// not the the *syntactic* one (see `syntactic_source_info` for more details).
-    pub source_info: SourceInfo,
-
     /// The *syntactic* (i.e. not visibility) source scope the local is defined
     /// in. If the local was defined in a let-statement, this
     /// is *within* the let-statement, rather than outside
@@ -562,7 +558,7 @@ pub struct LocalDecl<'tcx> {
     /// To allow both uses to work, we need to have more than a single scope
     /// for a local. We have the `syntactic_source_info.scope` represent the
     /// "syntactic" lint scope (with a variable being under its let
-    /// block) while the `source_info.scope` represents the "local variable"
+    /// block) while the `visibility_source_info.scope` represents the "local variable"
     /// scope (where the "rest" of a block is under all prior let-statements).
     ///
     /// The end result looks like this:
@@ -581,14 +577,18 @@ pub struct LocalDecl<'tcx> {
     ///  │ │
     ///  │ │ │{ let y: u32 }
     ///  │ │ │
-    ///  │ │ │← y.source_info.scope
+    ///  │ │ │← y.visibility_source_info.scope
     ///  │ │ │← `y + 2`
     ///  │
     ///  │ │{ let x: u32 }
-    ///  │ │← x.source_info.scope
+    ///  │ │← x.visibility_source_info.scope
     ///  │ │← `drop(x)` // this accesses `x: u32`
     /// ```
     pub syntactic_source_info: SourceInfo,
+
+    /// Source info of the local. The `SourceScope` is the *visibility* one,
+    /// not the the *syntactic* one (see `syntactic_source_info` for more details).
+    pub visibility_source_info: SourceInfo,
 }
 
 impl<'tcx> LocalDecl<'tcx> {
@@ -599,11 +599,11 @@ impl<'tcx> LocalDecl<'tcx> {
             mutability: Mutability::Mut,
             ty,
             name: None,
-            source_info: SourceInfo {
+            syntactic_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
-            syntactic_source_info: SourceInfo {
+            visibility_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
@@ -619,11 +619,11 @@ impl<'tcx> LocalDecl<'tcx> {
             mutability: Mutability::Mut,
             ty,
             name: None,
-            source_info: SourceInfo {
+            syntactic_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
-            syntactic_source_info: SourceInfo {
+            visibility_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
@@ -640,11 +640,11 @@ impl<'tcx> LocalDecl<'tcx> {
         LocalDecl {
             mutability: Mutability::Mut,
             ty: return_ty,
-            source_info: SourceInfo {
+            syntactic_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
-            syntactic_source_info: SourceInfo {
+            visibility_source_info: SourceInfo {
                 span,
                 scope: OUTERMOST_SOURCE_SCOPE
             },
@@ -2200,8 +2200,8 @@ BraceStructTypeFoldableImpl! {
         internal,
         ty,
         name,
-        source_info,
         syntactic_source_info,
+        visibility_source_info,
     }
 }
 
diff --git a/src/librustc/mir/visit.rs b/src/librustc/mir/visit.rs
@@ -714,18 +714,18 @@ macro_rules! make_mir_visitor {
                     mutability: _,
                     ref $($mutability)* ty,
                     name: _,
-                    ref $($mutability)* source_info,
-                    internal: _,
                     ref $($mutability)* syntactic_source_info,
+                    ref $($mutability)* visibility_source_info,
+                    internal: _,
                     is_user_variable: _,
                 } = *local_decl;
 
                 self.visit_ty(ty, TyContext::LocalDecl {
                     local,
-                    source_info: *source_info,
+                    source_info: *visibility_source_info,
                 });
                 self.visit_source_info(syntactic_source_info);
-                self.visit_source_info(source_info);
+                self.visit_source_info(visibility_source_info);
             }
 
             fn super_source_scope(&mut self,
diff --git a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs b/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
@@ -65,7 +65,7 @@ pub fn create_mir_scopes(cx: &CodegenCx, mir: &Mir, debug_context: &FunctionDebu
     let mut has_variables = BitVector::new(mir.source_scopes.len());
     for var in mir.vars_iter() {
         let decl = &mir.local_decls[var];
-        has_variables.insert(decl.source_info.scope.index());
+        has_variables.insert(decl.visibility_source_info.scope.index());
     }
 
     // Instantiate all scopes.
diff --git a/src/librustc_codegen_llvm/mir/mod.rs b/src/librustc_codegen_llvm/mir/mod.rs
@@ -265,7 +265,7 @@ pub fn codegen_mir<'a, 'tcx: 'a>(
 
             if let Some(name) = decl.name {
                 // User variable
-                let debug_scope = fx.scopes[decl.source_info.scope];
+                let debug_scope = fx.scopes[decl.visibility_source_info.scope];
                 let dbg = debug_scope.is_valid() && bx.sess().opts.debuginfo == FullDebugInfo;
 
                 if !memory_locals.contains(local.index()) && !dbg {
@@ -276,7 +276,7 @@ pub fn codegen_mir<'a, 'tcx: 'a>(
                 debug!("alloc: {:?} ({}) -> place", local, name);
                 let place = PlaceRef::alloca(&bx, layout, &name.as_str());
                 if dbg {
-                    let (scope, span) = fx.debug_loc(decl.source_info);
+                    let (scope, span) = fx.debug_loc(decl.visibility_source_info);
                     declare_local(&bx, &fx.debug_context, name, layout.ty, scope,
                         VariableAccess::DirectVariable { alloca: place.llval },
                         VariableKind::LocalVariable, span);
diff --git a/src/librustc_mir/borrow_check/error_reporting.rs b/src/librustc_mir/borrow_check/error_reporting.rs
@@ -398,7 +398,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
 
         let borrow_span = self.mir.source_info(borrow.reserve_location).span;
         let proper_span = match *root_place {
-            Place::Local(local) => self.mir.local_decls[local].source_info.span,
+            Place::Local(local) => self.mir.local_decls[local].visibility_source_info.span,
             _ => drop_span,
         };
 
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
@@ -306,7 +306,7 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
                 None => continue,
             }
 
-            let source_info = local_decl.source_info;
+            let source_info = local_decl.visibility_source_info;
             let mut_span = tcx.sess.codemap().span_until_non_whitespace(source_info.span);
 
             tcx.struct_span_lint_node(
diff --git a/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs b/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs
@@ -67,7 +67,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
                             }
                             None => {
                                 err.span_label(
-                                    mir.local_decls[local].source_info.span,
+                                    mir.local_decls[local].visibility_source_info.span,
                                     "borrow may end up in a temporary, created here",
                                 );
 
diff --git a/src/librustc_mir/borrow_check/nll/type_check/mod.rs b/src/librustc_mir/borrow_check/nll/type_check/mod.rs
@@ -1201,7 +1201,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
             LocalKind::Var | LocalKind::Temp => {}
         }
 
-        let span = local_decl.source_info.span;
+        let span = local_decl.visibility_source_info.span;
         let ty = local_decl.ty;
 
         // Erase the regions from `ty` to get a global type.  The
diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs
@@ -246,8 +246,8 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                         mutability: Mutability::Mut,
                         ty: ptr_ty,
                         name: None,
-                        source_info,
                         syntactic_source_info: source_info,
+                        visibility_source_info: source_info,
                         internal: true,
                         is_user_variable: false
                     });
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs
@@ -294,22 +294,22 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
         block.unit()
     }
 
-    /// Declares the bindings of the given pattern and returns the source scope
+    /// Declares the bindings of the given pattern and returns the visibility scope
     /// for the bindings in this patterns, if such a scope had to be created.
     /// NOTE: Declaring the bindings should always be done in their drop scope.
     pub fn declare_bindings(&mut self,
-                            mut var_scope: Option<SourceScope>,
+                            mut visibility_scope: Option<SourceScope>,
                             scope_span: Span,
                             lint_level: LintLevel,
                             pattern: &Pattern<'tcx>,
                             has_guard: ArmHasGuard)
                             -> Option<SourceScope> {
-        assert!(!(var_scope.is_some() && lint_level.is_explicit()),
-                "can't have both a var and a lint scope at the same time");
+        assert!(!(visibility_scope.is_some() && lint_level.is_explicit()),
+                "can't have both a visibility and a lint scope at the same time");
         let mut syntactic_scope = self.source_scope;
         self.visit_bindings(pattern, &mut |this, mutability, name, var, span, ty| {
-            if var_scope.is_none() {
-                var_scope = Some(this.new_source_scope(scope_span,
+            if visibility_scope.is_none() {
+                visibility_scope = Some(this.new_source_scope(scope_span,
                                                            LintLevel::Inherited,
                                                            None));
                 // If we have lints, create a new source scope
@@ -320,18 +320,18 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                         this.new_source_scope(scope_span, lint_level, None);
                 }
             }
-            let source_info = SourceInfo {
-                span,
-                scope: var_scope.unwrap()
-            };
             let syntactic_source_info = SourceInfo {
                 span,
                 scope: syntactic_scope,
             };
-            this.declare_binding(source_info, syntactic_source_info, mutability, name, var,
+            let visibility_source_info = SourceInfo {
+                span,
+                scope: visibility_scope.unwrap()
+            };
+            this.declare_binding(syntactic_source_info, visibility_source_info, mutability, name, var,
                                  ty, has_guard);
         });
-        var_scope
+        visibility_scope
     }
 
     pub fn storage_live_binding(&mut self,
@@ -1117,25 +1117,25 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
     /// `&T`. The second local is a binding for occurrences of `var`
     /// in the arm body, which will have type `T`.
     fn declare_binding(&mut self,
-                       source_info: SourceInfo,
                        syntactic_source_info: SourceInfo,
+                       visibility_source_info: SourceInfo,
                        mutability: Mutability,
                        name: Name,
                        var_id: NodeId,
                        var_ty: Ty<'tcx>,
                        has_guard: ArmHasGuard)
     {
-        debug!("declare_binding(var_id={:?}, name={:?}, var_ty={:?}, source_info={:?}, \
+        debug!("declare_binding(var_id={:?}, name={:?}, var_ty={:?}, visibility_source_info={:?}, \
                 syntactic_source_info={:?})",
-               var_id, name, var_ty, source_info, syntactic_source_info);
+               var_id, name, var_ty, visibility_source_info, syntactic_source_info);
 
         let tcx = self.hir.tcx();
         let local = LocalDecl::<'tcx> {
             mutability,
             ty: var_ty.clone(),
             name: Some(name),
-            source_info,
             syntactic_source_info,
+            visibility_source_info,
             internal: false,
             is_user_variable: true,
         };
@@ -1146,8 +1146,8 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                 mutability,
                 ty: tcx.mk_imm_ref(tcx.types.re_empty, var_ty),
                 name: Some(name),
-                source_info,
                 syntactic_source_info,
+                visibility_source_info,
                 internal: false,
                 is_user_variable: true,
             });
diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs
@@ -664,8 +664,8 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
             self.local_decls.push(LocalDecl {
                 mutability: Mutability::Mut,
                 ty,
-                source_info,
                 syntactic_source_info: source_info,
+                visibility_source_info: source_info,
                 name,
                 internal: false,
                 is_user_variable: false,
diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/src/librustc_mir/dataflow/move_paths/builder.rs
@@ -233,7 +233,7 @@ impl<'a, 'gcx, 'tcx> MoveDataBuilder<'a, 'gcx, 'tcx> {
     fn gather_args(&mut self) {
         for arg in self.mir.args_iter() {
             let path = self.data.rev_lookup.locals[arg];
-            let span = self.mir.local_decls[arg].source_info.span;
+            let span = self.mir.local_decls[arg].visibility_source_info.span;
 
             let init = self.data.inits.push(Init {
                 path, span, kind: InitKind::Deep
diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs
@@ -141,8 +141,8 @@ fn temp_decl(mutability: Mutability, ty: Ty, span: Span) -> LocalDecl {
     let source_info = SourceInfo { scope: OUTERMOST_SOURCE_SCOPE, span };
     LocalDecl {
         mutability, ty, name: None,
-        source_info,
         syntactic_source_info: source_info,
+        visibility_source_info: source_info,
         internal: false,
         is_user_variable: false
     }
diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs
@@ -166,7 +166,7 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
                         // Internal locals are used in the `move_val_init` desugaring.
                         // We want to check unsafety against the source info of the
                         // desugaring, rather than the source info of the RHS.
-                        self.source_info = self.mir.local_decls[local].source_info;
+                        self.source_info = self.mir.local_decls[local].visibility_source_info;
                     }
                 }
                 let base_ty = base.ty(self.mir, self.tcx).to_ty(self.tcx);
diff --git a/src/librustc_mir/transform/generator.rs b/src/librustc_mir/transform/generator.rs
@@ -300,8 +300,8 @@ fn replace_result_variable<'tcx>(ret_ty: Ty<'tcx>,
         mutability: Mutability::Mut,
         ty: ret_ty,
         name: None,
-        source_info,
         syntactic_source_info: source_info,
+        visibility_source_info: source_info,
         internal: false,
         is_user_variable: false,
     };
@@ -641,8 +641,8 @@ fn create_generator_drop_shim<'a, 'tcx>(
         mutability: Mutability::Mut,
         ty: tcx.mk_nil(),
         name: None,
-        source_info,
         syntactic_source_info: source_info,
+        visibility_source_info: source_info,
         internal: false,
         is_user_variable: false,
     };
@@ -657,8 +657,8 @@ fn create_generator_drop_shim<'a, 'tcx>(
             mutbl: hir::Mutability::MutMutable,
         }),
         name: None,
-        source_info,
         syntactic_source_info: source_info,
+        visibility_source_info: source_info,
         internal: false,
         is_user_variable: false,
     };
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs
@@ -398,11 +398,12 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> {
                 for loc in callee_mir.vars_and_temps_iter() {
                     let mut local = callee_mir.local_decls[loc].clone();
 
-                    local.source_info.scope = scope_map[local.source_info.scope];
-                    local.source_info.span = callsite.location.span;
                     local.syntactic_source_info.scope =
                         scope_map[local.syntactic_source_info.scope];
                     local.syntactic_source_info.span = callsite.location.span;
+                    local.visibility_source_info.scope =
+                        scope_map[local.visibility_source_info.scope];
+                    local.visibility_source_info.span = callsite.location.span;
 
                     let idx = caller_mir.local_decls.push(local);
                     local_map.push(idx);
diff --git a/src/librustc_mir/transform/promote_consts.rs b/src/librustc_mir/transform/promote_consts.rs
@@ -210,7 +210,7 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
         let no_stmts = self.source[loc.block].statements.len();
         let new_temp = self.promoted.local_decls.push(
             LocalDecl::new_temp(self.source.local_decls[temp].ty,
-                                self.source.local_decls[temp].source_info.span));
+                                self.source.local_decls[temp].visibility_source_info.span));
 
         debug!("promote({:?} @ {:?}/{:?}, {:?})",
                temp, loc, no_stmts, self.keep_original);
@@ -334,8 +334,8 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
                             // This is because `*r` requires `r` to be a local,
                             // otherwise we would use the `promoted` directly.
                             let mut promoted_ref = LocalDecl::new_temp(ref_ty, span);
-                            promoted_ref.source_info = statement.source_info;
                             promoted_ref.syntactic_source_info = statement.source_info;
+                            promoted_ref.visibility_source_info = statement.source_info;
                             let promoted_ref = local_decls.push(promoted_ref);
                             assert_eq!(self.temps.push(TempState::Unpromotable), promoted_ref);
                             self.extra_statements.push((loc, Statement {
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ pub fn create_mir_scopes(cx: &CodegenCx, mir: &Mir, debug_context: &FunctionDebu`
`65`	`65`	`let mut has_variables = BitVector::new(mir.source_scopes.len());`
`66`	`66`	`for var in mir.vars_iter() {`
`67`	`67`	`let decl = &mir.local_decls[var];`
`68`		`- has_variables.insert(decl.source_info.scope.index());`
	`68`	`+ has_variables.insert(decl.visibility_source_info.scope.index());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Instantiate all scopes.`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(`
`306`	`306`	`None => continue,`
`307`	`307`	`}`
`308`	`308`
`309`		`- let source_info = local_decl.source_info;`
	`309`	`+ let source_info = local_decl.visibility_source_info;`
`310`	`310`	`let mut_span = tcx.sess.codemap().span_until_non_whitespace(source_info.span);`
`311`	`311`
`312`	`312`	`tcx.struct_span_lint_node(`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {`
`67`	`67`	`}`
`68`	`68`	`None => {`
`69`	`69`	`err.span_label(`
`70`		`- mir.local_decls[local].source_info.span,`
	`70`	`+ mir.local_decls[local].visibility_source_info.span,`
`71`	`71`	`"borrow may end up in a temporary, created here",`
`72`	`72`	`);`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {`
`1201`	`1201`	`LocalKind::Var \| LocalKind::Temp => {}`
`1202`	`1202`	`}`
`1203`	`1203`
`1204`		`- let span = local_decl.source_info.span;`
	`1204`	`+ let span = local_decl.visibility_source_info.span;`
`1205`	`1205`	`let ty = local_decl.ty;`
`1206`	`1206`
`1207`	`1207`	// Erase the regions from `ty` to get a global type. The