1 files changed, 40 insertions, 47 deletions

diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir
index 0c44873b7..2f5d356a2 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir
@@ -4,49 +4,49 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range<usize>) ->
     debug slice => _1;
     debug index => _2;
     let mut _0: &mut [u32];
+    let mut _3: usize;
+    let mut _4: usize;
     scope 1 (inlined core::slice::<impl [u32]>::get_unchecked_mut::<std::ops::Range<usize>>) {
         debug self => _1;
-        debug index => _2;
-        let mut _3: *mut [u32];
-        let mut _14: *mut [u32];
+        debug index => std::ops::Range<usize>{ .0 => _3, .1 => _4, };
+        let mut _5: *mut [u32];
+        let mut _13: *mut [u32];
         scope 2 {
             scope 3 (inlined <std::ops::Range<usize> as SliceIndex<[u32]>>::get_unchecked_mut) {
-                debug self => _2;
-                debug slice => _3;
-                let mut _4: usize;
-                let mut _5: usize;
+                debug self => std::ops::Range<usize>{ .0 => _3, .1 => _4, };
+                debug slice => _5;
                 let mut _7: *mut u32;
-                let mut _8: usize;
-                let mut _9: *mut u32;
-                let _15: std::ops::Range<usize>;
+                let mut _8: *mut u32;
+                let _14: usize;
+                let _15: usize;
                 scope 4 {
-                    debug this => _15;
+                    debug this => std::ops::Range<usize>{ .0 => _14, .1 => _15, };
                     scope 5 {
                         let _6: usize;
                         scope 6 {
                             debug new_len => _6;
                             scope 7 (inlined ptr::mut_ptr::<impl *mut [u32]>::as_mut_ptr) {
-                                debug self => _3;
+                                debug self => _5;
                             }
                             scope 8 (inlined ptr::mut_ptr::<impl *mut u32>::add) {
                                 debug self => _7;
-                                debug count => _8;
+                                debug count => _3;
                                 scope 9 {
                                 }
                             }
                             scope 10 (inlined slice_from_raw_parts_mut::<u32>) {
-                                debug data => _9;
+                                debug data => _8;
                                 debug len => _6;
-                                let mut _10: *mut ();
+                                let mut _9: *mut ();
                                 scope 11 (inlined ptr::mut_ptr::<impl *mut u32>::cast::<()>) {
-                                    debug self => _9;
+                                    debug self => _8;
                                 }
                                 scope 12 (inlined std::ptr::from_raw_parts_mut::<[u32]>) {
-                                    debug data_address => _10;
+                                    debug data_address => _9;
                                     debug metadata => _6;
-                                    let mut _11: *const ();
-                                    let mut _12: std::ptr::metadata::PtrComponents<[u32]>;
-                                    let mut _13: std::ptr::metadata::PtrRepr<[u32]>;
+                                    let mut _10: *const ();
+                                    let mut _11: std::ptr::metadata::PtrComponents<[u32]>;
+                                    let mut _12: std::ptr::metadata::PtrRepr<[u32]>;
                                     scope 13 {
                                     }
                                 }
@@ -59,45 +59,38 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range<usize>) ->
     }
 
     bb0: {
+        _3 = move (_2.0: usize);
+        _4 = move (_2.1: usize);
+        StorageLive(_5);
+        _5 = &raw mut (*_1);
         StorageLive(_14);
-        StorageLive(_3);
-        _3 = &raw mut (*_1);
         StorageLive(_15);
         StorageLive(_6);
-        StorageLive(_4);
-        _4 = (_2.1: usize);
-        StorageLive(_5);
-        _5 = (_2.0: usize);
-        _6 = SubUnchecked(move _4, move _5);
-        StorageDead(_5);
-        StorageDead(_4);
-        StorageLive(_9);
-        StorageLive(_7);
-        _7 = _3 as *mut u32 (PtrToPtr);
+        _6 = SubUnchecked(_4, _3);
         StorageLive(_8);
-        _8 = (_2.0: usize);
-        _9 = Offset(_7, _8);
-        StorageDead(_8);
+        StorageLive(_7);
+        _7 = _5 as *mut u32 (PtrToPtr);
+        _8 = Offset(_7, _3);
         StorageDead(_7);
-        StorageLive(_10);
-        _10 = _9 as *mut () (PtrToPtr);
-        StorageLive(_13);
+        StorageLive(_9);
+        _9 = _8 as *mut () (PtrToPtr);
         StorageLive(_12);
         StorageLive(_11);
-        _11 = _10 as *const () (PointerCoercion(MutToConstPointer));
-        _12 = ptr::metadata::PtrComponents::<[u32]> { data_address: move _11, metadata: _6 };
+        StorageLive(_10);
+        _10 = _9 as *const () (PointerCoercion(MutToConstPointer));
+        _11 = ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 };
+        StorageDead(_10);
+        _12 = ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 };
         StorageDead(_11);
-        _13 = ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _12 };
+        _13 = (_12.1: *mut [u32]);
         StorageDead(_12);
-        _14 = (_13.1: *mut [u32]);
-        StorageDead(_13);
-        StorageDead(_10);
         StorageDead(_9);
+        StorageDead(_8);
         StorageDead(_6);
-        StorageDead(_15);
-        StorageDead(_3);
-        _0 = &mut (*_14);
         StorageDead(_14);
+        StorageDead(_15);
+        StorageDead(_5);
+        _0 = &mut (*_13);
         return;
     }
 }