diff --git a/src/librustc/mir/visit.rs b/src/librustc/mir/visit.rs index 3aec9f10e3d5..3a1a8f02f497 100644 --- a/src/librustc/mir/visit.rs +++ b/src/librustc/mir/visit.rs @@ -722,7 +722,7 @@ macro_rules! make_mir_visitor { self.visit_ty(ty, TyContext::LocalDecl { local, - source_info: *visibility_source_info, + source_info: *syntactic_source_info, }); self.visit_source_info(syntactic_source_info); self.visit_source_info(visibility_source_info); diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs index 48de30f1ff18..38472418aab9 100644 --- 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].visibility_source_info; + self.source_info = self.mir.local_decls[local].syntactic_source_info; } } let base_ty = base.ty(self.mir, self.tcx).to_ty(self.tcx); diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs index bf01619d5b0b..520b7dfac4f7 100644 --- a/src/librustc_mir/util/pretty.rs +++ b/src/librustc_mir/util/pretty.rs @@ -467,8 +467,8 @@ fn write_scope_tree( // User variable types (including the user's name in a comment). for local in mir.vars_iter() { let var = &mir.local_decls[local]; - let (name, source_info) = if var.visibility_source_info.scope == child { - (var.name.unwrap(), var.visibility_source_info) + let (name, source_info) = if var.syntactic_source_info.scope == child { + (var.name.unwrap(), var.syntactic_source_info) } else { // Not a variable or not declared in this scope. continue; diff --git a/src/test/mir-opt/box_expr.rs b/src/test/mir-opt/box_expr.rs index ed9c303a16fd..8390a0d19ae7 100644 --- a/src/test/mir-opt/box_expr.rs +++ b/src/test/mir-opt/box_expr.rs @@ -33,9 +33,10 @@ impl Drop for S { // START rustc.main.ElaborateDrops.before.mir // let mut _0: (); // scope 1 { +// } +// scope 2 { // let _1: std::boxed::Box; // } -// ... // let mut _2: std::boxed::Box; // let mut _3: (); // let mut _4: std::boxed::Box; diff --git a/src/test/mir-opt/end_region_1.rs b/src/test/mir-opt/end_region_1.rs index 640dec0861d0..184459aa90eb 100644 --- a/src/test/mir-opt/end_region_1.rs +++ b/src/test/mir-opt/end_region_1.rs @@ -22,10 +22,10 @@ fn main() { // START rustc.main.SimplifyCfg-qualify-consts.after.mir // let mut _0: (); // ... -// let _1: i32; -// ... // let _2: &'10_1rs i32; // ... +// let _1: i32; +// ... // bb0: { // StorageLive(_1); // _1 = const 3i32; diff --git a/src/test/mir-opt/end_region_2.rs b/src/test/mir-opt/end_region_2.rs index 3fb5621c8ae3..c40ab5253a07 100644 --- a/src/test/mir-opt/end_region_2.rs +++ b/src/test/mir-opt/end_region_2.rs @@ -27,11 +27,11 @@ fn main() { // START rustc.main.SimplifyCfg-qualify-consts.after.mir // let mut _0: (); // ... -// let _2: bool; +// let _7: &'23_3rs bool; // ... // let _3: &'23_1rs bool; // ... -// let _7: &'23_3rs bool; +// let _2: bool; // ... // let mut _4: (); // let mut _5: bool; diff --git a/src/test/mir-opt/end_region_3.rs b/src/test/mir-opt/end_region_3.rs index 070bde8e3c3e..086d80d15eac 100644 --- a/src/test/mir-opt/end_region_3.rs +++ b/src/test/mir-opt/end_region_3.rs @@ -28,11 +28,11 @@ fn main() { // START rustc.main.SimplifyCfg-qualify-consts.after.mir // let mut _0: (); // ... -// let mut _1: bool; +// let _7: &'26_3rs bool; // ... // let _3: &'26_1rs bool; // ... -// let _7: &'26_3rs bool; +// let mut _1: bool; // ... // let mut _2: (); // let mut _4: (); diff --git a/src/test/mir-opt/end_region_4.rs b/src/test/mir-opt/end_region_4.rs index ded818688d72..fc58e0824e8b 100644 --- a/src/test/mir-opt/end_region_4.rs +++ b/src/test/mir-opt/end_region_4.rs @@ -32,13 +32,13 @@ fn foo(i: i32) { // START rustc.main.SimplifyCfg-qualify-consts.after.mir // let mut _0: (); // ... -// let _1: D; -// ... -// let _2: i32; +// let _6: &'26_4rs i32; // ... // let _3: &'26_2rs i32; // ... -// let _6: &'26_4rs i32; +// let _2: i32; +// ... +// let _1: D; // ... // let mut _4: (); // let mut _5: i32; diff --git a/src/test/mir-opt/end_region_8.rs b/src/test/mir-opt/end_region_8.rs index d621cdb4d58f..96a64f2eebfb 100644 --- a/src/test/mir-opt/end_region_8.rs +++ b/src/test/mir-opt/end_region_8.rs @@ -31,10 +31,10 @@ fn foo(f: F) where F: FnOnce() -> i32 { // fn main() -> () { // let mut _0: (); // ... -// let _1: D; -// ... // let _2: &'21_1rs D; // ... +// let _1: D; +// ... // let mut _3: (); // let mut _4: [closure@NodeId(22) r:&'19s D]; // let mut _5: &'21_1rs D; diff --git a/src/test/mir-opt/end_region_9.rs b/src/test/mir-opt/end_region_9.rs index 6d9a27eeeb45..15c31e178759 100644 --- a/src/test/mir-opt/end_region_9.rs +++ b/src/test/mir-opt/end_region_9.rs @@ -41,11 +41,11 @@ fn main() { // fn main() -> () { // let mut _0: (); // ... -// let mut _1: bool; +// let mut _4: &'33_0rs i32; // ... // let _2: i32; // ... -// let mut _4: &'33_0rs i32; +// let mut _1: bool; // ... // let mut _3: (); // let mut _5: !; diff --git a/src/test/mir-opt/end_region_cyclic.rs b/src/test/mir-opt/end_region_cyclic.rs index 9c939d0d2fba..2d6962c5a5c1 100644 --- a/src/test/mir-opt/end_region_cyclic.rs +++ b/src/test/mir-opt/end_region_cyclic.rs @@ -43,9 +43,9 @@ fn query() -> bool { true } // fn main() -> (){ // let mut _0: (); // scope 1 { -// let _2: S<'36_0rs>; // } // scope 2 { +// let _2: S<'36_0rs>; // } // let mut _1: (); // let mut _3: std::cell::Cell>>; diff --git a/src/test/mir-opt/issue-41110.rs b/src/test/mir-opt/issue-41110.rs index f7f447cc6ba6..e43b4052e07e 100644 --- a/src/test/mir-opt/issue-41110.rs +++ b/src/test/mir-opt/issue-41110.rs @@ -40,9 +40,10 @@ impl S { // START rustc.main.ElaborateDrops.after.mir // let mut _0: (); // scope 1 { +// } +// scope 2 { // let _1: (); // } -// ... // let mut _2: S; // let mut _3: S; // let mut _4: S; @@ -52,10 +53,10 @@ impl S { // START rustc.test.ElaborateDrops.after.mir // let mut _0: (); // ... -// let _1: S; -// ... // let mut _2: S; // ... +// let _1: S; +// ... // let mut _3: (); // let mut _4: S; // let mut _5: S; diff --git a/src/test/mir-opt/nll/reborrow-basic.rs b/src/test/mir-opt/nll/reborrow-basic.rs index b7c8d81b77fd..94a6a9799cf9 100644 --- a/src/test/mir-opt/nll/reborrow-basic.rs +++ b/src/test/mir-opt/nll/reborrow-basic.rs @@ -32,7 +32,7 @@ fn main() { // ... // | '_#9r | {bb0[10], bb0[14..=17]} // ... -// let _2: &'_#7r mut i32; -// ... // let _4: &'_#9r mut i32; +// ... +// let _2: &'_#7r mut i32; // END rustc.main.nll.0.mir diff --git a/src/test/mir-opt/nll/region-subtyping-basic.rs b/src/test/mir-opt/nll/region-subtyping-basic.rs index 16952143d0a5..57a11d8dd25c 100644 --- a/src/test/mir-opt/nll/region-subtyping-basic.rs +++ b/src/test/mir-opt/nll/region-subtyping-basic.rs @@ -37,10 +37,10 @@ fn main() { // | '_#4r | {bb2[5..=6], bb3[0..=1]} // END rustc.main.nll.0.mir // START rustc.main.nll.0.mir -// let _2: &'_#3r usize; -// ... // let _6: &'_#4r usize; // ... +// let _2: &'_#3r usize; +// ... // _2 = &'_#2r _1[_3]; // ... // _7 = _2; diff --git a/src/test/mir-opt/packed-struct-drop-aligned.rs b/src/test/mir-opt/packed-struct-drop-aligned.rs index 1b114419448f..9441c6f4085a 100644 --- a/src/test/mir-opt/packed-struct-drop-aligned.rs +++ b/src/test/mir-opt/packed-struct-drop-aligned.rs @@ -29,9 +29,9 @@ impl Drop for Droppy { // fn main() -> () { // let mut _0: (); // scope 1 { -// let mut _1: Packed; // } // scope 2 { +// let mut _1: Packed; // } // let mut _2: Aligned; // let mut _3: Droppy; diff --git a/src/test/mir-opt/validate_3.rs b/src/test/mir-opt/validate_3.rs index 79645bd36000..72ec9ce400ff 100644 --- a/src/test/mir-opt/validate_3.rs +++ b/src/test/mir-opt/validate_3.rs @@ -32,14 +32,14 @@ fn main() { // fn main() -> (){ // let mut _0: (); // scope 1 { -// let _1: Test; // scope 3 { -// let _2: &ReErased Test; // } // scope 4 { +// let _2: &ReErased Test; // } // } // scope 2 { +// let _1: Test; // } // let mut _3: (); // let mut _4: &ReErased i32;