Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

35 files changed, 194 insertions, 206 deletions

diff --git a/tests/mir-opt/building/custom/aggregate_exprs.adt.built.after.mir b/tests/mir-opt/building/custom/aggregate_exprs.adt.built.after.mir
index 49e8c812c..c14882142 100644
--- a/tests/mir-opt/building/custom/aggregate_exprs.adt.built.after.mir
+++ b/tests/mir-opt/building/custom/aggregate_exprs.adt.built.after.mir
@@ -1,16 +1,16 @@
 // MIR for `adt` after built
 
 fn adt() -> Onion {
-    let mut _0: Onion;                   // return place in scope 0 at $DIR/aggregate_exprs.rs:+0:13: +0:18
-    let mut _1: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _2: Foo;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _3: Bar;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: Onion;
+    let mut _1: i32;
+    let mut _2: Foo;
+    let mut _3: Bar;
 
     bb0: {
-        _1 = const 1_i32;                // scope 0 at $DIR/aggregate_exprs.rs:+6:13: +6:20
-        _2 = Foo { a: const 1_i32, b: const 2_i32 }; // scope 0 at $DIR/aggregate_exprs.rs:+7:13: +10:14
-        _3 = Bar::Foo(move _2, _1);      // scope 0 at $DIR/aggregate_exprs.rs:+11:13: +11:39
-        _0 = Onion { neon: ((_3 as variant#0).1: i32) }; // scope 0 at $DIR/aggregate_exprs.rs:+12:13: +12:58
-        return;                          // scope 0 at $DIR/aggregate_exprs.rs:+13:13: +13:21
+        _1 = const 1_i32;
+        _2 = Foo { a: const 1_i32, b: const 2_i32 };
+        _3 = Bar::Foo(move _2, _1);
+        _0 = Onion { neon: ((_3 as variant#0).1: i32) };
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/aggregate_exprs.array.built.after.mir b/tests/mir-opt/building/custom/aggregate_exprs.array.built.after.mir
index 30d128973..fde007aba 100644
--- a/tests/mir-opt/building/custom/aggregate_exprs.array.built.after.mir
+++ b/tests/mir-opt/building/custom/aggregate_exprs.array.built.after.mir
@@ -1,15 +1,15 @@
 // MIR for `array` after built
 
 fn array() -> [i32; 2] {
-    let mut _0: [i32; 2];                // return place in scope 0 at $DIR/aggregate_exprs.rs:+0:15: +0:23
-    let mut _1: [i32; 2];                // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _2: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: [i32; 2];
+    let mut _1: [i32; 2];
+    let mut _2: i32;
 
     bb0: {
-        _1 = [const 42_i32, const 43_i32]; // scope 0 at $DIR/aggregate_exprs.rs:+5:13: +5:25
-        _2 = const 1_i32;                // scope 0 at $DIR/aggregate_exprs.rs:+6:13: +6:20
-        _1 = [_2, const 2_i32];          // scope 0 at $DIR/aggregate_exprs.rs:+7:13: +7:25
-        _0 = move _1;                    // scope 0 at $DIR/aggregate_exprs.rs:+8:13: +8:26
-        return;                          // scope 0 at $DIR/aggregate_exprs.rs:+9:13: +9:21
+        _1 = [const 42_i32, const 43_i32];
+        _2 = const 1_i32;
+        _1 = [_2, const 2_i32];
+        _0 = move _1;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/aggregate_exprs.tuple.built.after.mir b/tests/mir-opt/building/custom/aggregate_exprs.tuple.built.after.mir
index 5fe45ccc9..060f72c9c 100644
--- a/tests/mir-opt/building/custom/aggregate_exprs.tuple.built.after.mir
+++ b/tests/mir-opt/building/custom/aggregate_exprs.tuple.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `tuple` after built
 
 fn tuple() -> (i32, bool) {
-    let mut _0: (i32, bool);             // return place in scope 0 at $DIR/aggregate_exprs.rs:+0:15: +0:26
+    let mut _0: (i32, bool);
 
     bb0: {
-        _0 = (const 1_i32, const true);  // scope 0 at $DIR/aggregate_exprs.rs:+3:13: +3:28
-        return;                          // scope 0 at $DIR/aggregate_exprs.rs:+4:13: +4:21
+        _0 = (const 1_i32, const true);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir b/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
index 20dd251e7..189996f11 100644
--- a/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
+++ b/tests/mir-opt/building/custom/arbitrary_let.arbitrary_let.built.after.mir
@@ -1,22 +1,22 @@
 // MIR for `arbitrary_let` after built
 
 fn arbitrary_let(_1: i32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/arbitrary_let.rs:+0:29: +0:32
-    let mut _2: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _3: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: i32;
+    let mut _2: i32;
+    let mut _3: i32;
 
     bb0: {
-        _2 = _1;                         // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        goto -> bb2;                     // scope 0 at $DIR/arbitrary_let.rs:+4:13: +4:25
+        _2 = _1;
+        goto -> bb2;
     }
 
     bb1: {
-        _0 = _3;                         // scope 0 at $DIR/arbitrary_let.rs:+7:13: +7:20
-        return;                          // scope 0 at $DIR/arbitrary_let.rs:+8:13: +8:21
+        _0 = _3;
+        return;
     }
 
     bb2: {
-        _3 = _2;                         // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        goto -> bb1;                     // scope 0 at $DIR/arbitrary_let.rs:+12:13: +12:24
+        _3 = _2;
+        goto -> bb1;
     }
 }
diff --git a/tests/mir-opt/building/custom/arrays.arrays.built.after.mir b/tests/mir-opt/building/custom/arrays.arrays.built.after.mir
index 4c9212728..eaeba302f 100644
--- a/tests/mir-opt/building/custom/arrays.arrays.built.after.mir
+++ b/tests/mir-opt/building/custom/arrays.arrays.built.after.mir
@@ -1,14 +1,14 @@
 // MIR for `arrays` after built
 
 fn arrays() -> usize {
-    let mut _0: usize;                   // return place in scope 0 at $DIR/arrays.rs:+0:32: +0:37
-    let mut _1: [i32; C];                // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _2: usize;                   // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: usize;
+    let mut _1: [i32; C];
+    let mut _2: usize;
 
     bb0: {
-        _1 = [const 5_i32; C];           // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _2 = Len(_1);                    // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _0 = _2;                         // scope 0 at $DIR/arrays.rs:+4:9: +4:16
-        return;                          // scope 0 at $DIR/arrays.rs:+5:9: +5:17
+        _1 = [const 5_i32; C];
+        _2 = Len(_1);
+        _0 = _2;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/as_cast.float_to_int.built.after.mir b/tests/mir-opt/building/custom/as_cast.float_to_int.built.after.mir
index d0b770783..e3334bc7d 100644
--- a/tests/mir-opt/building/custom/as_cast.float_to_int.built.after.mir
+++ b/tests/mir-opt/building/custom/as_cast.float_to_int.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `float_to_int` after built
 
 fn float_to_int(_1: f32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/as_cast.rs:+0:28: +0:31
+    let mut _0: i32;
 
     bb0: {
-        _0 = _1 as i32 (FloatToInt);     // scope 0 at $DIR/as_cast.rs:+3:13: +3:27
-        return;                          // scope 0 at $DIR/as_cast.rs:+4:13: +4:21
+        _0 = _1 as i32 (FloatToInt);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/as_cast.int_to_int.built.after.mir b/tests/mir-opt/building/custom/as_cast.int_to_int.built.after.mir
index aaebff0d7..d71cb9d78 100644
--- a/tests/mir-opt/building/custom/as_cast.int_to_int.built.after.mir
+++ b/tests/mir-opt/building/custom/as_cast.int_to_int.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `int_to_int` after built
 
 fn int_to_int(_1: u32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/as_cast.rs:+0:26: +0:29
+    let mut _0: i32;
 
     bb0: {
-        _0 = _1 as i32 (IntToInt);       // scope 0 at $DIR/as_cast.rs:+3:13: +3:27
-        return;                          // scope 0 at $DIR/as_cast.rs:+4:13: +4:21
+        _0 = _1 as i32 (IntToInt);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/as_cast.int_to_ptr.built.after.mir b/tests/mir-opt/building/custom/as_cast.int_to_ptr.built.after.mir
index f040cf53d..0dc46d61e 100644
--- a/tests/mir-opt/building/custom/as_cast.int_to_ptr.built.after.mir
+++ b/tests/mir-opt/building/custom/as_cast.int_to_ptr.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `int_to_ptr` after built
 
 fn int_to_ptr(_1: usize) -> *const i32 {
-    let mut _0: *const i32;              // return place in scope 0 at $DIR/as_cast.rs:+0:28: +0:38
+    let mut _0: *const i32;
 
     bb0: {
-        _0 = _1 as *const i32 (PointerFromExposedAddress); // scope 0 at $DIR/as_cast.rs:+3:13: +3:34
-        return;                          // scope 0 at $DIR/as_cast.rs:+4:13: +4:21
+        _0 = _1 as *const i32 (PointerFromExposedAddress);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/composite_return.tuple.built.after.mir b/tests/mir-opt/building/custom/composite_return.tuple.built.after.mir
index d159c1a65..836622ec2 100644
--- a/tests/mir-opt/building/custom/composite_return.tuple.built.after.mir
+++ b/tests/mir-opt/building/custom/composite_return.tuple.built.after.mir
@@ -1,11 +1,11 @@
 // MIR for `tuple` after built
 
 fn tuple() -> (i32, bool) {
-    let mut _0: (i32, bool);             // return place in scope 0 at $DIR/composite_return.rs:+0:15: +0:26
+    let mut _0: (i32, bool);
 
     bb0: {
-        (_0.0: i32) = const 1_i32;       // scope 0 at $DIR/composite_return.rs:+4:13: +4:22
-        (_0.1: bool) = const true;       // scope 0 at $DIR/composite_return.rs:+5:13: +5:25
-        return;                          // scope 0 at $DIR/composite_return.rs:+6:13: +6:21
+        (_0.0: i32) = const 1_i32;
+        (_0.1: bool) = const true;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/consts.consts.built.after.mir b/tests/mir-opt/building/custom/consts.consts.built.after.mir
index ba753cfc2..05de272af 100644
--- a/tests/mir-opt/building/custom/consts.consts.built.after.mir
+++ b/tests/mir-opt/building/custom/consts.consts.built.after.mir
@@ -1,22 +1,19 @@
 // MIR for `consts` after built
 
 fn consts() -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/consts.rs:+0:27: +0:27
-    let mut _1: u8;                      // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _2: i8;                      // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _3: u32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _4: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _5: fn() {consts::<10>};     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: ();
+    let mut _1: u8;
+    let mut _2: i8;
+    let mut _3: u32;
+    let mut _4: i32;
+    let mut _5: fn() {consts::<10>};
 
     bb0: {
-        _1 = const 5_u8;                 // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _2 = const _;                    // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _3 = const C;                    // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _4 = const _;                    // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _5 = consts::<10>;               // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-                                         // mir::Constant
-                                         // + span: $DIR/consts.rs:16:18: 16:30
-                                         // + literal: Const { ty: fn() {consts::<10>}, val: Value(<ZST>) }
-        return;                          // scope 0 at $DIR/consts.rs:+7:9: +7:17
+        _1 = const 5_u8;
+        _2 = const _;
+        _3 = const C;
+        _4 = const _;
+        _5 = consts::<10>;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/consts.statics.built.after.mir b/tests/mir-opt/building/custom/consts.statics.built.after.mir
index bfef976aa..ea394c5b7 100644
--- a/tests/mir-opt/building/custom/consts.statics.built.after.mir
+++ b/tests/mir-opt/building/custom/consts.statics.built.after.mir
@@ -1,20 +1,14 @@
 // MIR for `statics` after built
 
 fn statics() -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/consts.rs:+0:14: +0:14
-    let mut _1: &i32;                    // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _2: *mut i32;                // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: ();
+    let mut _1: &i32;
+    let mut _2: *mut i32;
 
     bb0: {
-        _1 = const {alloc1: &i32};       // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-                                         // mir::Constant
-                                         // + span: $DIR/consts.rs:27:31: 27:32
-                                         // + literal: Const { ty: &i32, val: Value(Scalar(alloc1)) }
-        _2 = const {alloc2: *mut i32};   // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-                                         // mir::Constant
-                                         // + span: $DIR/consts.rs:28:38: 28:39
-                                         // + literal: Const { ty: *mut i32, val: Value(Scalar(alloc2)) }
-        return;                          // scope 0 at $DIR/consts.rs:+4:9: +4:17
+        _1 = const {alloc1: &i32};
+        _2 = const {alloc2: *mut i32};
+        return;
     }
 }
 
diff --git a/tests/mir-opt/building/custom/enums.set_discr.built.after.mir b/tests/mir-opt/building/custom/enums.set_discr.built.after.mir
index 6d0747365..8cc66e7e5 100644
--- a/tests/mir-opt/building/custom/enums.set_discr.built.after.mir
+++ b/tests/mir-opt/building/custom/enums.set_discr.built.after.mir
@@ -1,11 +1,11 @@
 // MIR for `set_discr` after built
 
 fn set_discr(_1: &mut Option<()>) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/enums.rs:+0:39: +0:39
+    let mut _0: ();
 
     bb0: {
-        Deinit((*_1));                   // scope 0 at $DIR/enums.rs:+2:9: +2:24
-        discriminant((*_1)) = 0;         // scope 0 at $DIR/enums.rs:+3:9: +3:36
-        return;                          // scope 0 at $DIR/enums.rs:+4:9: +4:17
+        Deinit((*_1));
+        discriminant((*_1)) = 0;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir b/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir
index 6fdc3d0f4..55ade43ed 100644
--- a/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir
+++ b/tests/mir-opt/building/custom/enums.set_discr_repr.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `set_discr_repr` after built
 
 fn set_discr_repr(_1: &mut Bool) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/enums.rs:+0:33: +0:33
+    let mut _0: ();
 
     bb0: {
-        discriminant((*_1)) = 0;         // scope 0 at $DIR/enums.rs:+2:9: +2:31
-        return;                          // scope 0 at $DIR/enums.rs:+3:9: +3:17
+        discriminant((*_1)) = 0;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir b/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir
index 95c57d2dc..f82e5f1c6 100644
--- a/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir
+++ b/tests/mir-opt/building/custom/enums.switch_bool.built.after.mir
@@ -1,19 +1,19 @@
 // MIR for `switch_bool` after built
 
 fn switch_bool(_1: bool) -> u32 {
-    let mut _0: u32;                     // return place in scope 0 at $DIR/enums.rs:+0:32: +0:35
+    let mut _0: u32;
 
     bb0: {
-        switchInt(_1) -> [1: bb1, 0: bb2, otherwise: bb2]; // scope 0 at $DIR/enums.rs:+3:13: +7:14
+        switchInt(_1) -> [1: bb1, 0: bb2, otherwise: bb2];
     }
 
     bb1: {
-        _0 = const 5_u32;                // scope 0 at $DIR/enums.rs:+11:13: +11:20
-        return;                          // scope 0 at $DIR/enums.rs:+12:13: +12:21
+        _0 = const 5_u32;
+        return;
     }
 
     bb2: {
-        _0 = const 10_u32;               // scope 0 at $DIR/enums.rs:+16:13: +16:21
-        return;                          // scope 0 at $DIR/enums.rs:+17:13: +17:21
+        _0 = const 10_u32;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/enums.switch_option.built.after.mir b/tests/mir-opt/building/custom/enums.switch_option.built.after.mir
index a659ba7c1..fa03f274b 100644
--- a/tests/mir-opt/building/custom/enums.switch_option.built.after.mir
+++ b/tests/mir-opt/building/custom/enums.switch_option.built.after.mir
@@ -1,21 +1,21 @@
 // MIR for `switch_option` after built
 
 fn switch_option(_1: Option<()>) -> bool {
-    let mut _0: bool;                    // return place in scope 0 at $DIR/enums.rs:+0:45: +0:49
-    let mut _2: isize;                   // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: bool;
+    let mut _2: isize;
 
     bb0: {
-        _2 = discriminant(_1);           // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        switchInt(_2) -> [0: bb1, 1: bb2, otherwise: bb2]; // scope 0 at $DIR/enums.rs:+4:13: +8:14
+        _2 = discriminant(_1);
+        switchInt(_2) -> [0: bb1, 1: bb2, otherwise: bb2];
     }
 
     bb1: {
-        _0 = const false;                // scope 0 at $DIR/enums.rs:+12:13: +12:24
-        return;                          // scope 0 at $DIR/enums.rs:+13:13: +13:21
+        _0 = const false;
+        return;
     }
 
     bb2: {
-        _0 = const true;                 // scope 0 at $DIR/enums.rs:+17:13: +17:23
-        return;                          // scope 0 at $DIR/enums.rs:+18:13: +18:21
+        _0 = const true;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir b/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir
index d60e4b1b7..eec2197a8 100644
--- a/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir
+++ b/tests/mir-opt/building/custom/enums.switch_option_repr.built.after.mir
@@ -1,21 +1,21 @@
 // MIR for `switch_option_repr` after built
 
 fn switch_option_repr(_1: Bool) -> bool {
-    let mut _0: bool;                    // return place in scope 0 at $DIR/enums.rs:+0:40: +0:44
-    let mut _2: u8;                      // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: bool;
+    let mut _2: u8;
 
     bb0: {
-        _2 = discriminant(_1);           // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        switchInt(_2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/enums.rs:+4:13: +7:14
+        _2 = discriminant(_1);
+        switchInt(_2) -> [0: bb2, otherwise: bb1];
     }
 
     bb1: {
-        _0 = const true;                 // scope 0 at $DIR/enums.rs:+11:13: +11:23
-        return;                          // scope 0 at $DIR/enums.rs:+12:13: +12:21
+        _0 = const true;
+        return;
     }
 
     bb2: {
-        _0 = const false;                // scope 0 at $DIR/enums.rs:+16:13: +16:24
-        return;                          // scope 0 at $DIR/enums.rs:+17:13: +17:21
+        _0 = const false;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/operators.f.built.after.mir b/tests/mir-opt/building/custom/operators.f.built.after.mir
index cb43d5e6e..33eb6b720 100644
--- a/tests/mir-opt/building/custom/operators.f.built.after.mir
+++ b/tests/mir-opt/building/custom/operators.f.built.after.mir
@@ -1,30 +1,30 @@
 // MIR for `f` after built
 
 fn f(_1: i32, _2: bool) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/operators.rs:+0:30: +0:33
-    let mut _3: (i32, bool);             // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: i32;
+    let mut _3: (i32, bool);
 
     bb0: {
-        _1 = Neg(_1);                    // scope 0 at $DIR/operators.rs:+2:9: +2:15
-        _2 = Not(_2);                    // scope 0 at $DIR/operators.rs:+3:9: +3:15
-        _1 = Add(_1, _1);                // scope 0 at $DIR/operators.rs:+4:9: +4:18
-        _1 = Sub(_1, _1);                // scope 0 at $DIR/operators.rs:+5:9: +5:18
-        _1 = Mul(_1, _1);                // scope 0 at $DIR/operators.rs:+6:9: +6:18
-        _1 = Div(_1, _1);                // scope 0 at $DIR/operators.rs:+7:9: +7:18
-        _1 = Rem(_1, _1);                // scope 0 at $DIR/operators.rs:+8:9: +8:18
-        _1 = BitXor(_1, _1);             // scope 0 at $DIR/operators.rs:+9:9: +9:18
-        _1 = BitAnd(_1, _1);             // scope 0 at $DIR/operators.rs:+10:9: +10:18
-        _1 = Shl(_1, _1);                // scope 0 at $DIR/operators.rs:+11:9: +11:19
-        _1 = Shr(_1, _1);                // scope 0 at $DIR/operators.rs:+12:9: +12:19
-        _2 = Eq(_1, _1);                 // scope 0 at $DIR/operators.rs:+13:9: +13:19
-        _2 = Lt(_1, _1);                 // scope 0 at $DIR/operators.rs:+14:9: +14:18
-        _2 = Le(_1, _1);                 // scope 0 at $DIR/operators.rs:+15:9: +15:19
-        _2 = Ge(_1, _1);                 // scope 0 at $DIR/operators.rs:+16:9: +16:19
-        _2 = Gt(_1, _1);                 // scope 0 at $DIR/operators.rs:+17:9: +17:18
-        _3 = CheckedAdd(_1, _1);         // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _2 = (_3.1: bool);               // scope 0 at $DIR/operators.rs:+19:9: +19:18
-        _1 = (_3.0: i32);                // scope 0 at $DIR/operators.rs:+20:9: +20:18
-        _0 = _1;                         // scope 0 at $DIR/operators.rs:+21:9: +21:16
-        return;                          // scope 0 at $DIR/operators.rs:+22:9: +22:17
+        _1 = Neg(_1);
+        _2 = Not(_2);
+        _1 = Add(_1, _1);
+        _1 = Sub(_1, _1);
+        _1 = Mul(_1, _1);
+        _1 = Div(_1, _1);
+        _1 = Rem(_1, _1);
+        _1 = BitXor(_1, _1);
+        _1 = BitAnd(_1, _1);
+        _1 = Shl(_1, _1);
+        _1 = Shr(_1, _1);
+        _2 = Eq(_1, _1);
+        _2 = Lt(_1, _1);
+        _2 = Le(_1, _1);
+        _2 = Ge(_1, _1);
+        _2 = Gt(_1, _1);
+        _3 = CheckedAdd(_1, _1);
+        _2 = (_3.1: bool);
+        _1 = (_3.0: i32);
+        _0 = _1;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.copy_for_deref.built.after.mir b/tests/mir-opt/building/custom/projections.copy_for_deref.built.after.mir
index 5233d0489..b1ba5f931 100644
--- a/tests/mir-opt/building/custom/projections.copy_for_deref.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.copy_for_deref.built.after.mir
@@ -1,12 +1,12 @@
 // MIR for `copy_for_deref` after built
 
 fn copy_for_deref(_1: (&i32, i32)) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:38: +0:41
-    let mut _2: &i32;                    // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: i32;
+    let mut _2: &i32;
 
     bb0: {
-        _2 = deref_copy (_1.0: &i32);    // scope 0 at $DIR/projections.rs:+4:13: +4:37
-        _0 = (*_2);                      // scope 0 at $DIR/projections.rs:+5:13: +5:24
-        return;                          // scope 0 at $DIR/projections.rs:+6:13: +6:21
+        _2 = deref_copy (_1.0: &i32);
+        _0 = (*_2);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.set.built.after.mir b/tests/mir-opt/building/custom/projections.set.built.after.mir
index 2f15176a6..9e756c504 100644
--- a/tests/mir-opt/building/custom/projections.set.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.set.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `set` after built
 
 fn set(_1: &mut Option<i32>) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/projections.rs:+0:31: +0:31
+    let mut _0: ();
 
     bb0: {
-        (((*_1) as variant#1).0: i32) = const 10_i32; // scope 0 at $DIR/projections.rs:+2:9: +2:48
-        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+        (((*_1) as variant#1).0: i32) = const 10_i32;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.simple_index.built.after.mir b/tests/mir-opt/building/custom/projections.simple_index.built.after.mir
index fc422e4b3..f74c61009 100644
--- a/tests/mir-opt/building/custom/projections.simple_index.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.simple_index.built.after.mir
@@ -1,13 +1,13 @@
 // MIR for `simple_index` after built
 
 fn simple_index(_1: [i32; 10], _2: &[i32]) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:45: +0:48
-    let mut _3: usize;                   // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: i32;
+    let mut _3: usize;
 
     bb0: {
-        _3 = const 3_usize;              // scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-        _0 = _1[_3];                     // scope 0 at $DIR/projections.rs:+3:9: +3:22
-        _0 = (*_2)[_3];                  // scope 0 at $DIR/projections.rs:+4:9: +4:25
-        return;                          // scope 0 at $DIR/projections.rs:+5:9: +5:17
+        _3 = const 3_usize;
+        _0 = _1[_3];
+        _0 = (*_2)[_3];
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.tuples.built.after.mir b/tests/mir-opt/building/custom/projections.tuples.built.after.mir
index dec575200..a370de2ed 100644
--- a/tests/mir-opt/building/custom/projections.tuples.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.tuples.built.after.mir
@@ -1,11 +1,11 @@
 // MIR for `tuples` after built
 
 fn tuples(_1: (u32, i32)) -> (u32, i32) {
-    let mut _0: (u32, i32);              // return place in scope 0 at $DIR/projections.rs:+0:29: +0:39
+    let mut _0: (u32, i32);
 
     bb0: {
-        (_0.0: u32) = (_1.0: u32);       // scope 0 at $DIR/projections.rs:+4:13: +4:24
-        (_0.1: i32) = (_1.1: i32);       // scope 0 at $DIR/projections.rs:+5:13: +5:24
-        return;                          // scope 0 at $DIR/projections.rs:+6:13: +6:21
+        (_0.0: u32) = (_1.0: u32);
+        (_0.1: i32) = (_1.1: i32);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.unions.built.after.mir b/tests/mir-opt/building/custom/projections.unions.built.after.mir
index 922538a5f..4189b329e 100644
--- a/tests/mir-opt/building/custom/projections.unions.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.unions.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `unions` after built
 
 fn unions(_1: U) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:20: +0:23
+    let mut _0: i32;
 
     bb0: {
-        _0 = (_1.0: i32);                // scope 0 at $DIR/projections.rs:+2:9: +2:18
-        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+        _0 = (_1.0: i32);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.unwrap.built.after.mir b/tests/mir-opt/building/custom/projections.unwrap.built.after.mir
index 75b03a3c3..0c43bdc9d 100644
--- a/tests/mir-opt/building/custom/projections.unwrap.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.unwrap.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `unwrap` after built
 
 fn unwrap(_1: Option<i32>) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:32: +0:35
+    let mut _0: i32;
 
     bb0: {
-        _0 = ((_1 as variant#1).0: i32); // scope 0 at $DIR/projections.rs:+2:9: +2:40
-        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+        _0 = ((_1 as variant#1).0: i32);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir b/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir
index c6b0f7efa..39e978513 100644
--- a/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir
+++ b/tests/mir-opt/building/custom/projections.unwrap_deref.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `unwrap_deref` after built
 
 fn unwrap_deref(_1: Option<&i32>) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/projections.rs:+0:39: +0:42
+    let mut _0: i32;
 
     bb0: {
-        _0 = (*((_1 as variant#1).0: &i32)); // scope 0 at $DIR/projections.rs:+2:9: +2:49
-        return;                          // scope 0 at $DIR/projections.rs:+3:9: +3:17
+        _0 = (*((_1 as variant#1).0: &i32));
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/references.immut_ref.built.after.mir b/tests/mir-opt/building/custom/references.immut_ref.built.after.mir
index f5ee11262..d1e1aab99 100644
--- a/tests/mir-opt/building/custom/references.immut_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/references.immut_ref.built.after.mir
@@ -1,13 +1,13 @@
 // MIR for `immut_ref` after built
 
 fn immut_ref(_1: &i32) -> &i32 {
-    let mut _0: &i32;                    // return place in scope 0 at $DIR/references.rs:+0:30: +0:34
-    let mut _2: *const i32;              // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: &i32;
+    let mut _2: *const i32;
 
     bb0: {
-        _2 = &raw const (*_1);           // scope 0 at $DIR/references.rs:+5:13: +5:29
-        _0 = &(*_2);                     // scope 0 at $DIR/references.rs:+6:13: +6:23
-        Retag(_0);                       // scope 0 at $DIR/references.rs:+7:13: +7:23
-        return;                          // scope 0 at $DIR/references.rs:+8:13: +8:21
+        _2 = &raw const (*_1);
+        _0 = &(*_2);
+        Retag(_0);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/references.mut_ref.built.after.mir b/tests/mir-opt/building/custom/references.mut_ref.built.after.mir
index 8e2ffc33b..c82cb3274 100644
--- a/tests/mir-opt/building/custom/references.mut_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/references.mut_ref.built.after.mir
@@ -1,13 +1,13 @@
 // MIR for `mut_ref` after built
 
 fn mut_ref(_1: &mut i32) -> &mut i32 {
-    let mut _0: &mut i32;                // return place in scope 0 at $DIR/references.rs:+0:32: +0:40
-    let mut _2: *mut i32;                // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: &mut i32;
+    let mut _2: *mut i32;
 
     bb0: {
-        _2 = &raw mut (*_1);             // scope 0 at $DIR/references.rs:+5:13: +5:33
-        _0 = &mut (*_2);                 // scope 0 at $DIR/references.rs:+6:13: +6:26
-        Retag(_0);                       // scope 0 at $DIR/references.rs:+7:13: +7:23
-        return;                          // scope 0 at $DIR/references.rs:+8:13: +8:21
+        _2 = &raw mut (*_1);
+        _0 = &mut (*_2);
+        Retag(_0);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir b/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir
index 775e5e3ad..57c7f92a3 100644
--- a/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir
+++ b/tests/mir-opt/building/custom/references.raw_pointer.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `raw_pointer` after built
 
 fn raw_pointer(_1: *const i32) -> *const i32 {
-    let mut _0: *const i32;              // return place in scope 0 at $DIR/references.rs:+0:38: +0:48
+    let mut _0: *const i32;
 
     bb0: {
-        _0 = &raw const (*_1);           // scope 0 at $DIR/references.rs:+4:9: +4:27
-        return;                          // scope 0 at $DIR/references.rs:+5:9: +5:17
+        _0 = &raw const (*_1);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/references.raw_pointer_offset.built.after.mir b/tests/mir-opt/building/custom/references.raw_pointer_offset.built.after.mir
index f614aef40..8046b543e 100644
--- a/tests/mir-opt/building/custom/references.raw_pointer_offset.built.after.mir
+++ b/tests/mir-opt/building/custom/references.raw_pointer_offset.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `raw_pointer_offset` after built
 
 fn raw_pointer_offset(_1: *const i32) -> *const i32 {
-    let mut _0: *const i32;              // return place in scope 0 at $DIR/references.rs:+0:45: +0:55
+    let mut _0: *const i32;
 
     bb0: {
-        _0 = Offset(_1, const 1_isize);  // scope 0 at $DIR/references.rs:+2:9: +2:33
-        return;                          // scope 0 at $DIR/references.rs:+3:9: +3:17
+        _0 = Offset(_1, const 1_isize);
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir b/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir
index 743016708..6f7aaeed9 100644
--- a/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir
+++ b/tests/mir-opt/building/custom/simple_assign.simple.built.after.mir
@@ -1,20 +1,20 @@
 // MIR for `simple` after built
 
 fn simple(_1: i32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/simple_assign.rs:+0:26: +0:29
-    let mut _2: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
-    let mut _3: i32;                     // in scope 0 at $SRC_DIR/core/src/intrinsics/mir.rs:LL:COL
+    let mut _0: i32;
+    let mut _2: i32;
+    let mut _3: i32;
 
     bb0: {
-        StorageLive(_2);                 // scope 0 at $DIR/simple_assign.rs:+6:13: +6:31
-        _2 = _1;                         // scope 0 at $DIR/simple_assign.rs:+7:13: +7:22
-        goto -> bb1;                     // scope 0 at $DIR/simple_assign.rs:+8:13: +8:23
+        StorageLive(_2);
+        _2 = _1;
+        goto -> bb1;
     }
 
     bb1: {
-        _3 = move _2;                    // scope 0 at $DIR/simple_assign.rs:+12:13: +12:32
-        StorageDead(_2);                 // scope 0 at $DIR/simple_assign.rs:+13:13: +13:31
-        _0 = _3;                         // scope 0 at $DIR/simple_assign.rs:+14:13: +14:24
-        return;                          // scope 0 at $DIR/simple_assign.rs:+15:13: +15:21
+        _3 = move _2;
+        StorageDead(_2);
+        _0 = _3;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir b/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
index 2b0e8f104..b6d822998 100644
--- a/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
+++ b/tests/mir-opt/building/custom/simple_assign.simple_ref.built.after.mir
@@ -1,10 +1,10 @@
 // MIR for `simple_ref` after built
 
 fn simple_ref(_1: &mut i32) -> &mut i32 {
-    let mut _0: &mut i32;                // return place in scope 0 at $DIR/simple_assign.rs:+0:35: +0:43
+    let mut _0: &mut i32;
 
     bb0: {
-        _0 = move _1;                    // scope 0 at $DIR/simple_assign.rs:+2:9: +2:22
-        return;                          // scope 0 at $DIR/simple_assign.rs:+3:9: +3:17
+        _0 = move _1;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir b/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir
index a1a27226b..9cf26dff3 100644
--- a/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir
+++ b/tests/mir-opt/building/custom/terminators.assert_nonzero.built.after.mir
@@ -1,17 +1,17 @@
 // MIR for `assert_nonzero` after built
 
 fn assert_nonzero(_1: i32) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:27: +0:27
+    let mut _0: ();
 
     bb0: {
-        switchInt(_1) -> [0: bb1, otherwise: bb2]; // scope 0 at $DIR/terminators.rs:+3:13: +6:14
+        switchInt(_1) -> [0: bb1, otherwise: bb2];
     }
 
     bb1: {
-        unreachable;                     // scope 0 at $DIR/terminators.rs:+10:13: +10:26
+        unreachable;
     }
 
     bb2: {
-        return;                          // scope 0 at $DIR/terminators.rs:+14:13: +14:21
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir b/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir
index 1b2345a96..07044ceae 100644
--- a/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir
+++ b/tests/mir-opt/building/custom/terminators.direct_call.built.after.mir
@@ -1,16 +1,13 @@
 // MIR for `direct_call` after built
 
 fn direct_call(_1: i32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/terminators.rs:+0:27: +0:30
+    let mut _0: i32;
 
     bb0: {
-        _0 = ident::<i32>(_1) -> bb1;    // scope 0 at $DIR/terminators.rs:+3:13: +3:42
-                                         // mir::Constant
-                                         // + span: $DIR/terminators.rs:15:33: 15:38
-                                         // + literal: Const { ty: fn(i32) -> i32 {ident::<i32>}, val: Value(<ZST>) }
+        _0 = ident::<i32>(_1) -> [return: bb1, unwind continue];
     }
 
     bb1: {
-        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir b/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir
index ada78c0fc..6524f754d 100644
--- a/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir
+++ b/tests/mir-opt/building/custom/terminators.drop_first.built.after.mir
@@ -1,14 +1,14 @@
 // MIR for `drop_first` after built
 
 fn drop_first(_1: WriteOnDrop<'_>, _2: WriteOnDrop<'_>) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:59: +0:59
+    let mut _0: ();
 
     bb0: {
-        drop(_1) -> bb1;                 // scope 0 at $DIR/terminators.rs:+3:13: +3:30
+        drop(_1) -> [return: bb1, unwind continue];
     }
 
     bb1: {
-        _1 = move _2;                    // scope 0 at $DIR/terminators.rs:+7:13: +7:24
-        return;                          // scope 0 at $DIR/terminators.rs:+8:13: +8:21
+        _1 = move _2;
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir b/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir
index f14246f2d..ed3728121 100644
--- a/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir
+++ b/tests/mir-opt/building/custom/terminators.drop_second.built.after.mir
@@ -1,13 +1,13 @@
 // MIR for `drop_second` after built
 
 fn drop_second(_1: WriteOnDrop<'_>, _2: WriteOnDrop<'_>) -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/terminators.rs:+0:60: +0:60
+    let mut _0: ();
 
     bb0: {
-        drop(_2) -> bb1;                 // scope 0 at $DIR/terminators.rs:+3:13: +3:30
+        drop(_2) -> [return: bb1, unwind continue];
     }
 
     bb1: {
-        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+        return;
     }
 }
diff --git a/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir b/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir
index 2f1b14069..3b849354d 100644
--- a/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir
+++ b/tests/mir-opt/building/custom/terminators.indirect_call.built.after.mir
@@ -1,13 +1,13 @@
 // MIR for `indirect_call` after built
 
 fn indirect_call(_1: i32, _2: fn(i32) -> i32) -> i32 {
-    let mut _0: i32;                     // return place in scope 0 at $DIR/terminators.rs:+0:48: +0:51
+    let mut _0: i32;
 
     bb0: {
-        _0 = _2(_1) -> bb1;              // scope 0 at $DIR/terminators.rs:+3:13: +3:38
+        _0 = _2(_1) -> [return: bb1, unwind continue];
     }
 
     bb1: {
-        return;                          // scope 0 at $DIR/terminators.rs:+7:13: +7:21
+        return;
     }
 }