1 files changed, 49 insertions, 74 deletions

diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
index 513651090a8..5b6441cfb3b 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
@@ -5,86 +5,63 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     debug f => _2;
     let mut _0: ();
     let mut _3: usize;
-    let mut _4: std::ops::Range<usize>;
-    let mut _5: std::ops::Range<usize>;
-    let mut _6: &mut std::ops::Range<usize>;
-    let mut _14: std::option::Option<usize>;
-    let mut _16: usize;
-    let mut _17: bool;
-    let mut _19: &impl Fn(usize, &T);
-    let mut _20: (usize, &T);
-    let _21: ();
+    let mut _4: usize;
+    let mut _9: std::option::Option<usize>;
+    let mut _11: usize;
+    let mut _12: bool;
+    let mut _14: &impl Fn(usize, &T);
+    let mut _15: (usize, &T);
+    let _16: ();
     scope 1 {
-        debug iter => _5;
-        let _15: usize;
+        debug ((iter: std::ops::Range<usize>).0: usize) => _4;
+        debug ((iter: std::ops::Range<usize>).1: usize) => _3;
+        let _10: usize;
         scope 2 {
-            debug i => _15;
-            let _18: &T;
+            debug i => _10;
+            let _13: &T;
             scope 3 {
-                debug x => _18;
+                debug x => _13;
             }
         }
         scope 5 (inlined iter::range::<impl Iterator for std::ops::Range<usize>>::next) {
-            debug self => _6;
             scope 6 (inlined <std::ops::Range<usize> as iter::range::RangeIteratorImpl>::spec_next) {
-                debug self => _6;
-                let mut _7: &usize;
-                let mut _8: &usize;
-                let mut _11: bool;
-                let _12: usize;
-                let mut _13: usize;
+                let mut _6: bool;
+                let _7: usize;
+                let mut _8: usize;
                 scope 7 {
-                    debug old => _12;
                 }
                 scope 8 (inlined std::cmp::impls::<impl PartialOrd for usize>::lt) {
-                    debug self => _7;
-                    debug other => _8;
-                    let mut _9: usize;
-                    let mut _10: usize;
+                    let mut _5: usize;
                 }
             }
         }
     }
     scope 4 (inlined <std::ops::Range<usize> as IntoIterator>::into_iter) {
-        debug self => _4;
     }
 
     bb0: {
-        StorageLive(_3);
         _3 = Len((*_1));
-        _4 = std::ops::Range::<usize> { start: const 0_usize, end: move _3 };
-        StorageDead(_3);
-        StorageLive(_5);
-        _5 = _4;
+        StorageLive(_4);
+        _4 = const 0_usize;
         goto -> bb1;
     }
 
     bb1: {
-        StorageLive(_14);
-        _6 = &mut _5;
-        StorageLive(_12);
-        StorageLive(_11);
-        StorageLive(_7);
-        _7 = &(_5.0: usize);
-        StorageLive(_8);
-        _8 = &(_5.1: usize);
         StorageLive(_9);
-        _9 = (_5.0: usize);
-        StorageLive(_10);
-        _10 = (_5.1: usize);
-        _11 = Lt(move _9, move _10);
-        StorageDead(_10);
-        StorageDead(_9);
-        switchInt(move _11) -> [0: bb2, otherwise: bb4];
+        StorageLive(_7);
+        StorageLive(_6);
+        StorageLive(_5);
+        _5 = _4;
+        _6 = Lt(move _5, _3);
+        StorageDead(_5);
+        switchInt(move _6) -> [0: bb2, otherwise: bb4];
     }
 
     bb2: {
-        StorageDead(_8);
+        StorageDead(_6);
         StorageDead(_7);
-        StorageDead(_11);
-        StorageDead(_12);
-        StorageDead(_14);
-        StorageDead(_5);
+        StorageDead(_9);
+        StorageDead(_4);
         drop(_2) -> [return: bb3, unwind continue];
     }
 
@@ -93,38 +70,36 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     }
 
     bb4: {
-        StorageDead(_8);
-        StorageDead(_7);
-        _12 = (_5.0: usize);
-        StorageLive(_13);
-        _13 = <usize as Step>::forward_unchecked(_12, const 1_usize) -> [return: bb5, unwind: bb8];
+        _7 = _4;
+        StorageLive(_8);
+        _8 = <usize as Step>::forward_unchecked(_7, const 1_usize) -> [return: bb5, unwind: bb8];
     }
 
     bb5: {
-        (_5.0: usize) = move _13;
-        StorageDead(_13);
-        _14 = Option::<usize>::Some(_12);
-        StorageDead(_11);
-        StorageDead(_12);
-        _15 = ((_14 as Some).0: usize);
-        _16 = Len((*_1));
-        _17 = Lt(_15, _16);
-        assert(move _17, "index out of bounds: the length is {} but the index is {}", move _16, _15) -> [success: bb6, unwind: bb8];
+        _4 = move _8;
+        StorageDead(_8);
+        _9 = Option::<usize>::Some(_7);
+        StorageDead(_6);
+        StorageDead(_7);
+        _10 = ((_9 as Some).0: usize);
+        _11 = Len((*_1));
+        _12 = Lt(_10, _11);
+        assert(move _12, "index out of bounds: the length is {} but the index is {}", move _11, _10) -> [success: bb6, unwind: bb8];
     }
 
     bb6: {
-        _18 = &(*_1)[_15];
-        StorageLive(_19);
-        _19 = &_2;
-        StorageLive(_20);
-        _20 = (_15, _18);
-        _21 = <impl Fn(usize, &T) as Fn<(usize, &T)>>::call(move _19, move _20) -> [return: bb7, unwind: bb8];
+        _13 = &(*_1)[_10];
+        StorageLive(_14);
+        _14 = &_2;
+        StorageLive(_15);
+        _15 = (_10, _13);
+        _16 = <impl Fn(usize, &T) as Fn<(usize, &T)>>::call(move _14, move _15) -> [return: bb7, unwind: bb8];
     }
 
     bb7: {
-        StorageDead(_20);
-        StorageDead(_19);
+        StorageDead(_15);
         StorageDead(_14);
+        StorageDead(_9);
         goto -> bb1;
     }