1 files changed, 42 insertions, 65 deletions

diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
index d5021ac84d2..ce8e2bd083e 100644
--- a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
@@ -5,77 +5,56 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     debug end => _2;
     debug f => _3;
     let mut _0: ();
-    let mut _4: std::ops::Range<u32>;
-    let mut _5: std::ops::Range<u32>;
-    let mut _6: &mut std::ops::Range<u32>;
-    let mut _14: std::option::Option<u32>;
-    let mut _16: &impl Fn(u32);
-    let mut _17: (u32,);
-    let _18: ();
+    let mut _4: u32;
+    let mut _9: std::option::Option<u32>;
+    let mut _11: &impl Fn(u32);
+    let mut _12: (u32,);
+    let _13: ();
     scope 1 {
-        debug iter => _5;
-        let _15: u32;
+        debug ((iter: std::ops::Range<u32>).0: u32) => _4;
+        debug ((iter: std::ops::Range<u32>).1: u32) => _2;
+        let _10: u32;
         scope 2 {
-            debug x => _15;
+            debug x => _10;
         }
         scope 4 (inlined iter::range::<impl Iterator for std::ops::Range<u32>>::next) {
-            debug self => _6;
             scope 5 (inlined <std::ops::Range<u32> as iter::range::RangeIteratorImpl>::spec_next) {
-                debug self => _6;
-                let mut _7: &u32;
-                let mut _8: &u32;
-                let mut _11: bool;
-                let _12: u32;
-                let mut _13: u32;
+                let mut _6: bool;
+                let _7: u32;
+                let mut _8: u32;
                 scope 6 {
-                    debug old => _12;
                 }
                 scope 7 (inlined std::cmp::impls::<impl PartialOrd for u32>::lt) {
-                    debug self => _7;
-                    debug other => _8;
-                    let mut _9: u32;
-                    let mut _10: u32;
+                    let mut _5: u32;
                 }
             }
         }
     }
     scope 3 (inlined <std::ops::Range<u32> as IntoIterator>::into_iter) {
-        debug self => _4;
     }
 
     bb0: {
-        _4 = std::ops::Range::<u32> { start: _1, end: _2 };
-        StorageLive(_5);
-        _5 = _4;
+        StorageLive(_4);
+        _4 = _1;
         goto -> bb1;
     }
 
     bb1: {
-        StorageLive(_14);
-        _6 = &mut _5;
-        StorageLive(_12);
-        StorageLive(_11);
-        StorageLive(_7);
-        _7 = &(_5.0: u32);
-        StorageLive(_8);
-        _8 = &(_5.1: u32);
         StorageLive(_9);
-        _9 = (_5.0: u32);
-        StorageLive(_10);
-        _10 = (_5.1: u32);
-        _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, _2);
+        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(_3) -> [return: bb3, unwind continue];
     }
 
@@ -84,31 +63,29 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     }
 
     bb4: {
-        StorageDead(_8);
-        StorageDead(_7);
-        _12 = (_5.0: u32);
-        StorageLive(_13);
-        _13 = <u32 as Step>::forward_unchecked(_12, const 1_usize) -> [return: bb5, unwind: bb7];
+        _7 = _4;
+        StorageLive(_8);
+        _8 = <u32 as Step>::forward_unchecked(_7, const 1_usize) -> [return: bb5, unwind: bb7];
     }
 
     bb5: {
-        (_5.0: u32) = move _13;
-        StorageDead(_13);
-        _14 = Option::<u32>::Some(_12);
-        StorageDead(_11);
-        StorageDead(_12);
-        _15 = ((_14 as Some).0: u32);
-        StorageLive(_16);
-        _16 = &_3;
-        StorageLive(_17);
-        _17 = (_15,);
-        _18 = <impl Fn(u32) as Fn<(u32,)>>::call(move _16, move _17) -> [return: bb6, unwind: bb7];
+        _4 = move _8;
+        StorageDead(_8);
+        _9 = Option::<u32>::Some(_7);
+        StorageDead(_6);
+        StorageDead(_7);
+        _10 = ((_9 as Some).0: u32);
+        StorageLive(_11);
+        _11 = &_3;
+        StorageLive(_12);
+        _12 = (_10,);
+        _13 = <impl Fn(u32) as Fn<(u32,)>>::call(move _11, move _12) -> [return: bb6, unwind: bb7];
     }
 
     bb6: {
-        StorageDead(_17);
-        StorageDead(_16);
-        StorageDead(_14);
+        StorageDead(_12);
+        StorageDead(_11);
+        StorageDead(_9);
         goto -> bb1;
     }