Bless mir-opt tests

rust-lang · Oct 7, 2024 · 128ccc3 · 128ccc3
1 parent 9d5c961
commit 128ccc3
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 98 deletions.
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
@@ -10,18 +10,12 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
         scope 2 (inlined std::ptr::const_ptr::<impl *const [u32]>::cast::<u8>) {
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            scope 4 (inlined core::ub_checks::check_language_ub) {
-                scope 5 (inlined core::ub_checks::check_language_ub::runtime) {
-                }
-            }
-            scope 6 (inlined std::mem::size_of::<u8>) {
-            }
         }
-        scope 7 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
+        scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
             let mut _5: usize;
-            scope 8 (inlined std::ptr::metadata::<[u32]>) {
+            scope 5 (inlined std::ptr::metadata::<[u32]>) {
             }
-            scope 9 (inlined std::ptr::from_raw_parts::<[u32], ()>) {
+            scope 6 (inlined std::ptr::from_raw_parts::<[u32], ()>) {
             }
         }
     }

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
@@ -10,18 +10,12 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
         scope 2 (inlined std::ptr::const_ptr::<impl *const [u32]>::cast::<u8>) {
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            scope 4 (inlined core::ub_checks::check_language_ub) {
-                scope 5 (inlined core::ub_checks::check_language_ub::runtime) {
-                }
-            }
-            scope 6 (inlined std::mem::size_of::<u8>) {
-            }
         }
-        scope 7 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
+        scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<[u32]>) {
             let mut _5: usize;
-            scope 8 (inlined std::ptr::metadata::<[u32]>) {
+            scope 5 (inlined std::ptr::metadata::<[u32]>) {
             }
-            scope 9 (inlined std::ptr::from_raw_parts::<[u32], ()>) {
+            scope 6 (inlined std::ptr::from_raw_parts::<[u32], ()>) {
             }
         }
     }

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
@@ -10,17 +10,11 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
         scope 2 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<u8>) {
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            scope 4 (inlined core::ub_checks::check_language_ub) {
-                scope 5 (inlined core::ub_checks::check_language_ub::runtime) {
-                }
-            }
-            scope 6 (inlined std::mem::size_of::<u8>) {
-            }
         }
-        scope 7 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
-            scope 8 (inlined std::ptr::metadata::<u32>) {
+        scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
+            scope 5 (inlined std::ptr::metadata::<u32>) {
             }
-            scope 9 (inlined std::ptr::from_raw_parts::<u32, ()>) {
+            scope 6 (inlined std::ptr::from_raw_parts::<u32, ()>) {
             }
         }
     }

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
@@ -10,17 +10,11 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
         scope 2 (inlined std::ptr::const_ptr::<impl *const u32>::cast::<u8>) {
         }
         scope 3 (inlined std::ptr::const_ptr::<impl *const u8>::add) {
-            scope 4 (inlined core::ub_checks::check_language_ub) {
-                scope 5 (inlined core::ub_checks::check_language_ub::runtime) {
-                }
-            }
-            scope 6 (inlined std::mem::size_of::<u8>) {
-            }
         }
-        scope 7 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
-            scope 8 (inlined std::ptr::metadata::<u32>) {
+        scope 4 (inlined std::ptr::const_ptr::<impl *const u8>::with_metadata_of::<u32>) {
+            scope 5 (inlined std::ptr::metadata::<u32>) {
             }
-            scope 9 (inlined std::ptr::from_raw_parts::<u32, ()>) {
+            scope 6 (inlined std::ptr::from_raw_parts::<u32, ()>) {
             }
         }
     }

diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir
@@ -19,30 +19,30 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
             debug i => _22;
             debug x => _23;
         }
-        scope 20 (inlined <Enumerate<std::slice::Iter<'_, T>> as Iterator>::next) {
+        scope 17 (inlined <Enumerate<std::slice::Iter<'_, T>> as Iterator>::next) {
             let mut _14: &mut std::slice::Iter<'_, T>;
             let mut _15: std::option::Option<&T>;
             let mut _19: (usize, bool);
             let mut _20: (usize, &T);
-            scope 21 {
+            scope 18 {
                 let _18: usize;
-                scope 26 {
+                scope 23 {
                 }
             }
-            scope 22 {
-                scope 23 {
-                    scope 29 (inlined <Option<(usize, &T)> as FromResidual<Option<Infallible>>>::from_residual) {
+            scope 19 {
+                scope 20 {
+                    scope 26 (inlined <Option<(usize, &T)> as FromResidual<Option<Infallible>>>::from_residual) {
                     }
                 }
             }
-            scope 24 {
-                scope 25 {
+            scope 21 {
+                scope 22 {
                 }
             }
-            scope 27 (inlined <Option<&T> as Try>::branch) {
+            scope 24 (inlined <Option<&T> as Try>::branch) {
                 let mut _16: isize;
                 let _17: &T;
-                scope 28 {
+                scope 25 {
                 }
             }
         }
@@ -64,12 +64,6 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -83,11 +77,11 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as Iterator>::enumerate) {
-        scope 18 (inlined Enumerate::<std::slice::Iter<'_, T>>::new) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as Iterator>::enumerate) {
+        scope 15 (inlined Enumerate::<std::slice::Iter<'_, T>>::new) {
         }
     }
-    scope 19 (inlined <Enumerate<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
+    scope 16 (inlined <Enumerate<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
     }
 
     bb0: {

diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir
@@ -39,12 +39,6 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -58,11 +52,11 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as Iterator>::enumerate) {
-        scope 18 (inlined Enumerate::<std::slice::Iter<'_, T>>::new) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as Iterator>::enumerate) {
+        scope 15 (inlined Enumerate::<std::slice::Iter<'_, T>>::new) {
         }
     }
-    scope 19 (inlined <Enumerate<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
+    scope 16 (inlined <Enumerate<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
     }
 
     bb0: {

diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir
@@ -36,12 +36,6 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -55,7 +49,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as IntoIterator>::into_iter) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as IntoIterator>::into_iter) {
     }
 
     bb0: {

diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir
@@ -36,12 +36,6 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -55,7 +49,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as IntoIterator>::into_iter) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as IntoIterator>::into_iter) {
     }
 
     bb0: {

diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir
@@ -18,7 +18,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
         scope 2 {
             debug x => _17;
         }
-        scope 20 (inlined <Rev<std::slice::Iter<'_, T>> as Iterator>::next) {
+        scope 17 (inlined <Rev<std::slice::Iter<'_, T>> as Iterator>::next) {
             let mut _14: &mut std::slice::Iter<'_, T>;
         }
     }
@@ -39,12 +39,6 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -58,11 +52,11 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as Iterator>::rev) {
-        scope 18 (inlined Rev::<std::slice::Iter<'_, T>>::new) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as Iterator>::rev) {
+        scope 15 (inlined Rev::<std::slice::Iter<'_, T>>::new) {
         }
     }
-    scope 19 (inlined <Rev<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
+    scope 16 (inlined <Rev<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
     }
 
     bb0: {

diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir
@@ -18,7 +18,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
         scope 2 {
             debug x => _17;
         }
-        scope 20 (inlined <Rev<std::slice::Iter<'_, T>> as Iterator>::next) {
+        scope 17 (inlined <Rev<std::slice::Iter<'_, T>> as Iterator>::next) {
             let mut _14: &mut std::slice::Iter<'_, T>;
         }
     }
@@ -39,12 +39,6 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
                     scope 12 (inlined NonNull::<T>::as_ptr) {
                     }
                     scope 13 (inlined std::ptr::mut_ptr::<impl *mut T>::add) {
-                        scope 14 (inlined core::ub_checks::check_language_ub) {
-                            scope 15 (inlined core::ub_checks::check_language_ub::runtime) {
-                            }
-                        }
-                        scope 16 (inlined std::mem::size_of::<T>) {
-                        }
                     }
                 }
                 scope 8 (inlined <NonNull<[T]> as From<&[T]>>::from) {
@@ -58,11 +52,11 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
             }
         }
     }
-    scope 17 (inlined <std::slice::Iter<'_, T> as Iterator>::rev) {
-        scope 18 (inlined Rev::<std::slice::Iter<'_, T>>::new) {
+    scope 14 (inlined <std::slice::Iter<'_, T> as Iterator>::rev) {
+        scope 15 (inlined Rev::<std::slice::Iter<'_, T>>::new) {
         }
     }
-    scope 19 (inlined <Rev<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
+    scope 16 (inlined <Rev<std::slice::Iter<'_, T>> as IntoIterator>::into_iter) {
     }
 
     bb0: {