Update tests after 123949

scottmcm · scottmcm · commit 5e785b1420d8 · 2024-04-21T11:24:54.000-07:00
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir
@@ -5,29 +5,19 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
     debug n => _2;
     let mut _0: *const [u32];
     scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::byte_add) {
-        debug self => _1;
-        debug count => _2;
         let mut _3: *const u8;
         let mut _4: *const u8;
         scope 2 (inlined std::ptr::const_ptr::<impl *const [u32]>::cast::<u8>) {
-            debug self => _1;
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            debug self => _3;
-            debug count => _2;
         }
         scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
-            debug self => _4;
-            debug meta => _1;
             let mut _5: *const ();
             let mut _7: usize;
             scope 5 (inlined std::ptr::metadata::<[u32]>) {
-                debug ptr => _1;
                 let mut _6: std::ptr::metadata::PtrRepr<[u32]>;
             }
             scope 6 (inlined std::ptr::from_raw_parts::<[u32]>) {
-                debug data_pointer => _5;
-                debug metadata => _7;
             }
         }
     }
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir
@@ -5,29 +5,19 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
     debug n => _2;
     let mut _0: *const [u32];
     scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::byte_add) {
-        debug self => _1;
-        debug count => _2;
         let mut _3: *const u8;
         let mut _4: *const u8;
         scope 2 (inlined std::ptr::const_ptr::<impl *const [u32]>::cast::<u8>) {
-            debug self => _1;
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            debug self => _3;
-            debug count => _2;
         }
         scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
-            debug self => _4;
-            debug meta => _1;
             let mut _5: *const ();
             let mut _7: usize;
             scope 5 (inlined std::ptr::metadata::<[u32]>) {
-                debug ptr => _1;
                 let mut _6: std::ptr::metadata::PtrRepr<[u32]>;
             }
             scope 6 (inlined std::ptr::from_raw_parts::<[u32]>) {
-                debug data_pointer => _5;
-                debug metadata => _7;
             }
         }
     }
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir
@@ -5,27 +5,16 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
     debug n => _2;
     let mut _0: *const u32;
     scope 1 (inlined std::ptr::const_ptr::<impl *const u32>::byte_add) {
-        debug self => _1;
-        debug count => _2;
         let mut _3: *const u8;
         let mut _4: *const u8;
         scope 2 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<u8>) {
-            debug self => _1;
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            debug self => _3;
-            debug count => _2;
         }
         scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
-            debug self => _4;
-            debug meta => _1;
-            let mut _5: *const ();
             scope 5 (inlined std::ptr::metadata::<u32>) {
-                debug ptr => _1;
             }
             scope 6 (inlined std::ptr::from_raw_parts::<u32>) {
-                debug data_pointer => _5;
-                debug metadata => const ();
             }
         }
     }
@@ -35,10 +24,7 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
         _3 = _1 as *const u8 (PtrToPtr);
         _4 = Offset(_3, _2);
         StorageDead(_3);
-        StorageLive(_5);
-        _5 = _4 as *const () (PtrToPtr);
         _0 = _4 as *const u32 (PtrToPtr);
-        StorageDead(_5);
         return;
     }
 }
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir
@@ -5,27 +5,16 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
     debug n => _2;
     let mut _0: *const u32;
     scope 1 (inlined std::ptr::const_ptr::<impl *const u32>::byte_add) {
-        debug self => _1;
-        debug count => _2;
         let mut _3: *const u8;
         let mut _4: *const u8;
         scope 2 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<u8>) {
-            debug self => _1;
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            debug self => _3;
-            debug count => _2;
         }
         scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
-            debug self => _4;
-            debug meta => _1;
-            let mut _5: *const ();
             scope 5 (inlined std::ptr::metadata::<u32>) {
-                debug ptr => _1;
             }
             scope 6 (inlined std::ptr::from_raw_parts::<u32>) {
-                debug data_pointer => _5;
-                debug metadata => const ();
             }
         }
     }
@@ -35,10 +24,7 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
         _3 = _1 as *const u8 (PtrToPtr);
         _4 = Offset(_3, _2);
         StorageDead(_3);
-        StorageLive(_5);
-        _5 = _4 as *const () (PtrToPtr);
         _0 = _4 as *const u32 (PtrToPtr);
-        StorageDead(_5);
         return;
     }
 }
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir
@@ -7,42 +7,25 @@ fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range<usize>) -
     let mut _3: usize;
     let mut _4: usize;
     scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::get_unchecked::<std::ops::Range<usize>>) {
-        debug self => _1;
-        debug ((index: std::ops::Range<usize>).0: usize) => _3;
-        debug ((index: std::ops::Range<usize>).1: usize) => _4;
         scope 2 (inlined <std::ops::Range<usize> as SliceIndex<[u32]>>::get_unchecked) {
-            debug ((self: std::ops::Range<usize>).0: usize) => _3;
-            debug ((self: std::ops::Range<usize>).1: usize) => _4;
-            debug slice => _1;
             let _5: usize;
             let mut _6: *const u32;
             let mut _7: *const u32;
             scope 3 {
-                debug new_len => _5;
                 scope 6 (inlined std::ptr::const_ptr::<impl *const [u32]>::as_ptr) {
-                    debug self => _1;
                 }
                 scope 7 (inlined std::ptr::const_ptr::<impl *const u32>::add) {
-                    debug self => _6;
-                    debug count => _3;
                 }
                 scope 8 (inlined slice_from_raw_parts::<u32>) {
-                    debug data => _7;
-                    debug len => _5;
                     let mut _8: *const ();
                     scope 9 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<()>) {
-                        debug self => _7;
                     }
                     scope 10 (inlined std::ptr::from_raw_parts::<[u32]>) {
-                        debug data_pointer => _8;
-                        debug metadata => _5;
                     }
                 }
             }
             scope 4 (inlined std::ptr::const_ptr::<impl *const [u32]>::len) {
-                debug self => _1;
                 scope 5 (inlined std::ptr::metadata::<[u32]>) {
-                    debug ptr => _1;
                 }
             }
         }
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir
@@ -7,42 +7,25 @@ fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range<usize>) -
     let mut _3: usize;
     let mut _4: usize;
     scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::get_unchecked::<std::ops::Range<usize>>) {
-        debug self => _1;
-        debug ((index: std::ops::Range<usize>).0: usize) => _3;
-        debug ((index: std::ops::Range<usize>).1: usize) => _4;
         scope 2 (inlined <std::ops::Range<usize> as SliceIndex<[u32]>>::get_unchecked) {
-            debug ((self: std::ops::Range<usize>).0: usize) => _3;
-            debug ((self: std::ops::Range<usize>).1: usize) => _4;
-            debug slice => _1;
             let _5: usize;
             let mut _6: *const u32;
             let mut _7: *const u32;
             scope 3 {
-                debug new_len => _5;
                 scope 6 (inlined std::ptr::const_ptr::<impl *const [u32]>::as_ptr) {
-                    debug self => _1;
                 }
                 scope 7 (inlined std::ptr::const_ptr::<impl *const u32>::add) {
-                    debug self => _6;
-                    debug count => _3;
                 }
                 scope 8 (inlined slice_from_raw_parts::<u32>) {
-                    debug data => _7;
-                    debug len => _5;
                     let mut _8: *const ();
                     scope 9 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<()>) {
-                        debug self => _7;
                     }
                     scope 10 (inlined std::ptr::from_raw_parts::<[u32]>) {
-                        debug data_pointer => _8;
-                        debug metadata => _5;
                     }
                 }
             }
             scope 4 (inlined std::ptr::const_ptr::<impl *const [u32]>::len) {
-                debug self => _1;
                 scope 5 (inlined std::ptr::metadata::<[u32]>) {
-                    debug ptr => _1;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -5,29 +5,19 @@ fn demo_byte_add_fat(_1: const [u32], _2: usize) -> const [u32] {`
`5`	`5`	`debug n => _2;`
`6`	`6`	`let mut _0: *const [u32];`
`7`	`7`	`scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::byte_add) {`
`8`		`- debug self => _1;`
`9`		`- debug count => _2;`
`10`	`8`	`let mut _3: *const u8;`
`11`	`9`	`let mut _4: *const u8;`
`12`	`10`	`scope 2 (inlined std::ptr::const_ptr::<impl *const [u32]>::cast::<u8>) {`
`13`		`- debug self => _1;`
`14`	`11`	`}`
`15`	`12`	`scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {`
`16`		`- debug self => _3;`
`17`		`- debug count => _2;`
`18`	`13`	`}`
`19`	`14`	`scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {`
`20`		`- debug self => _4;`
`21`		`- debug meta => _1;`
`22`	`15`	`let mut _5: *const ();`
`23`	`16`	`let mut _7: usize;`
`24`	`17`	`scope 5 (inlined std::ptr::metadata::<[u32]>) {`
`25`		`- debug ptr => _1;`
`26`	`18`	`let mut _6: std::ptr::metadata::PtrRepr<[u32]>;`
`27`	`19`	`}`
`28`	`20`	`scope 6 (inlined std::ptr::from_raw_parts::<[u32]>) {`
`29`		`- debug data_pointer => _5;`
`30`		`- debug metadata => _7;`
`31`	`21`	`}`
`32`	`22`	`}`
`33`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,27 +5,16 @@ fn demo_byte_add_thin(_1: const u32, _2: usize) -> const u32 {`
`5`	`5`	`debug n => _2;`
`6`	`6`	`let mut _0: *const u32;`
`7`	`7`	`scope 1 (inlined std::ptr::const_ptr::<impl *const u32>::byte_add) {`
`8`		`- debug self => _1;`
`9`		`- debug count => _2;`
`10`	`8`	`let mut _3: *const u8;`
`11`	`9`	`let mut _4: *const u8;`
`12`	`10`	`scope 2 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<u8>) {`
`13`		`- debug self => _1;`
`14`	`11`	`}`
`15`	`12`	`scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {`
`16`		`- debug self => _3;`
`17`		`- debug count => _2;`
`18`	`13`	`}`
`19`	`14`	`scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {`
`20`		`- debug self => _4;`
`21`		`- debug meta => _1;`
`22`		`- let mut _5: *const ();`
`23`	`15`	`scope 5 (inlined std::ptr::metadata::<u32>) {`
`24`		`- debug ptr => _1;`
`25`	`16`	`}`
`26`	`17`	`scope 6 (inlined std::ptr::from_raw_parts::<u32>) {`
`27`		`- debug data_pointer => _5;`
`28`		`- debug metadata => const ();`
`29`	`18`	`}`
`30`	`19`	`}`
`31`	`20`	`}`
`@@ -35,10 +24,7 @@ fn demo_byte_add_thin(_1: const u32, _2: usize) -> const u32 {`
`35`	`24`	`_3 = _1 as *const u8 (PtrToPtr);`
`36`	`25`	`_4 = Offset(_3, _2);`
`37`	`26`	`StorageDead(_3);`
`38`		`- StorageLive(_5);`
`39`		`- _5 = _4 as *const () (PtrToPtr);`
`40`	`27`	`_0 = _4 as *const u32 (PtrToPtr);`
`41`		`- StorageDead(_5);`
`42`	`28`	`return;`
`43`	`29`	`}`
`44`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,42 +7,25 @@ fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range<usize>) -`
`7`	`7`	`let mut _3: usize;`
`8`	`8`	`let mut _4: usize;`
`9`	`9`	`scope 1 (inlined std::ptr::const_ptr::<impl *const [u32]>::get_unchecked::<std::ops::Range<usize>>) {`
`10`		`- debug self => _1;`
`11`		`- debug ((index: std::ops::Range<usize>).0: usize) => _3;`
`12`		`- debug ((index: std::ops::Range<usize>).1: usize) => _4;`
`13`	`10`	`scope 2 (inlined <std::ops::Range<usize> as SliceIndex<[u32]>>::get_unchecked) {`
`14`		`- debug ((self: std::ops::Range<usize>).0: usize) => _3;`
`15`		`- debug ((self: std::ops::Range<usize>).1: usize) => _4;`
`16`		`- debug slice => _1;`
`17`	`11`	`let _5: usize;`
`18`	`12`	`let mut _6: *const u32;`
`19`	`13`	`let mut _7: *const u32;`
`20`	`14`	`scope 3 {`
`21`		`- debug new_len => _5;`
`22`	`15`	`scope 6 (inlined std::ptr::const_ptr::<impl *const [u32]>::as_ptr) {`
`23`		`- debug self => _1;`
`24`	`16`	`}`
`25`	`17`	`scope 7 (inlined std::ptr::const_ptr::<impl *const u32>::add) {`
`26`		`- debug self => _6;`
`27`		`- debug count => _3;`
`28`	`18`	`}`
`29`	`19`	`scope 8 (inlined slice_from_raw_parts::<u32>) {`
`30`		`- debug data => _7;`
`31`		`- debug len => _5;`
`32`	`20`	`let mut _8: *const ();`
`33`	`21`	`scope 9 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<()>) {`
`34`		`- debug self => _7;`
`35`	`22`	`}`
`36`	`23`	`scope 10 (inlined std::ptr::from_raw_parts::<[u32]>) {`
`37`		`- debug data_pointer => _8;`
`38`		`- debug metadata => _5;`
`39`	`24`	`}`
`40`	`25`	`}`
`41`	`26`	`}`
`42`	`27`	`scope 4 (inlined std::ptr::const_ptr::<impl *const [u32]>::len) {`
`43`		`- debug self => _1;`
`44`	`28`	`scope 5 (inlined std::ptr::metadata::<[u32]>) {`
`45`		`- debug ptr => _1;`
`46`	`29`	`}`
`47`	`30`	`}`
`48`	`31`	`}`