Fix tests

nbdd0121 · nbdd0121 · commit b0728ab591f7 · 2023-04-14T15:02:23.000+01:00
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.Inline.diff b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.Inline.diff
@@ -46,8 +46,6 @@
 +                 scope 11 {
 +                     scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
 +                         scope 14 {
-+                             scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-+                             }
 +                         }
 +                     }
 +                 }
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.mir
@@ -43,8 +43,6 @@ fn unchecked_shl_unsigned_smaller(_1: u16, _2: u32) -> u16 {
                 scope 11 {
                     scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
                         scope 14 {
-                            scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-                            }
                         }
                     }
                 }
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_smaller.Inline.diff b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_smaller.Inline.diff
@@ -46,8 +46,6 @@
 +                 scope 11 {
 +                     scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
 +                         scope 14 {
-+                             scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-+                             }
 +                         }
 +                     }
 +                 }
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_smaller.PreCodegen.after.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_smaller.PreCodegen.after.mir
@@ -43,8 +43,6 @@ fn unchecked_shr_signed_smaller(_1: i16, _2: u32) -> i16 {
                 scope 11 {
                     scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
                         scope 14 {
-                            scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-                            }
                         }
                     }
                 }
diff --git a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.Inline.diff b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.Inline.diff
@@ -15,8 +15,6 @@
 +         scope 3 {
 +             scope 5 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
 +                 scope 6 {
-+                     scope 7 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-+                     }
 +                 }
 +             }
 +         }
@@ -40,7 +38,7 @@
       bb1: {
 -         StorageDead(_2);                 // scope 0 at $DIR/unwrap_unchecked.rs:+1:26: +1:27
 -         return;                          // scope 0 at $DIR/unwrap_unchecked.rs:+2:2: +2:2
-+         unreachable;                     // scope 6 at $SRC_DIR/core/src/intrinsics.rs:LL:COL
++         unreachable;                     // scope 5 at $SRC_DIR/core/src/panic.rs:LL:COL
       }
   
 -     bb2 (cleanup): {
diff --git a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.mir b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.mir
@@ -13,8 +13,6 @@ fn unwrap_unchecked(_1: Option<T>) -> T {
         scope 3 {
             scope 5 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
                 scope 6 {
-                    scope 7 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
-                    }
                 }
             }
         }
@@ -30,7 +28,7 @@ fn unwrap_unchecked(_1: Option<T>) -> T {
     }
 
     bb1: {
-        unreachable;                     // scope 6 at $SRC_DIR/core/src/intrinsics.rs:LL:COL
+        unreachable;                     // scope 5 at $SRC_DIR/core/src/panic.rs:LL:COL
     }
 
     bb2: {
diff --git a/tests/ui/consts/const-eval/raw-bytes.64bit.stderr b/tests/ui/consts/const-eval/raw-bytes.64bit.stderr
diff --git a/tests/ui/consts/const-eval/raw-bytes.rs b/tests/ui/consts/const-eval/raw-bytes.rs
@@ -1,6 +1,7 @@
 // stderr-per-bitwidth
 // ignore-endian-big
 // ignore-tidy-linelength
+// ignore-debug debug assertions catch some UB too early
 // normalize-stderr-test "╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼" -> "╾ALLOC_ID$2╼"
 // normalize-stderr-test "alloc\d+" -> "allocN"
 #![feature(never_type, rustc_attrs, ptr_metadata, slice_from_ptr_range, const_slice_from_ptr_range)]
diff --git a/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs b/tests/ui/consts/const-eval/ub-slice-get-unchecked.rs
@@ -1,3 +1,4 @@
+// ignore-debug debug assertions produce different error message
 #![feature(const_slice_index)]
 
 const A: [(); 5] = [(), (), (), (), ()];
diff --git a/tests/ui/consts/const-eval/ub-slice-get-unchecked.stderr b/tests/ui/consts/const-eval/ub-slice-get-unchecked.stderr
@@ -8,7 +8,7 @@ note: inside `<std::ops::Range<usize> as SliceIndex<[()]>>::get_unchecked`
 note: inside `core::slice::<impl [()]>::get_unchecked::<std::ops::Range<usize>>`
   --> $SRC_DIR/core/src/slice/mod.rs:LL:COL
 note: inside `B`
-  --> $DIR/ub-slice-get-unchecked.rs:7:27
+  --> $DIR/ub-slice-get-unchecked.rs:8:27
    |
 LL | const B: &[()] = unsafe { A.get_unchecked(3..1) };
    |                           ^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/print_type_sizes/niche-filling.rs b/tests/ui/print_type_sizes/niche-filling.rs
@@ -1,4 +1,5 @@
 // compile-flags: -Z print-type-sizes --crate-type=lib
+// ignore-debug debug assertions will print more types
 // build-pass
 // ignore-pass
 // ^-- needed because `--pass check` does not emit the output needed.

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ fn unchecked_shl_unsigned_smaller(_1: u16, _2: u32) -> u16 {`
`43`	`43`	`scope 11 {`
`44`	`44`	`scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL`
`45`	`45`	`scope 14 {`
`46`		`- scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL`
`47`		`- }`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ fn unchecked_shr_signed_smaller(_1: i16, _2: u32) -> i16 {`
`43`	`43`	`scope 11 {`
`44`	`44`	`scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL`
`45`	`45`	`scope 14 {`
`46`		`- scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL`
`47`		`- }`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ fn unwrap_unchecked(_1: Option<T>) -> T {`
`13`	`13`	`scope 3 {`
`14`	`14`	`scope 5 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL`
`15`	`15`	`scope 6 {`
`16`		`- scope 7 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL`
`17`		`- }`
`18`	`16`	`}`
`19`	`17`	`}`
`20`	`18`	`}`
`@@ -30,7 +28,7 @@ fn unwrap_unchecked(_1: Option<T>) -> T {`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`bb1: {`
`33`		`- unreachable; // scope 6 at $SRC_DIR/core/src/intrinsics.rs:LL:COL`
	`31`	`+ unreachable; // scope 5 at $SRC_DIR/core/src/panic.rs:LL:COL`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`bb2: {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// ignore-debug debug assertions produce different error message`
`1`	`2`	`#![feature(const_slice_index)]`
`2`	`3`
`3`	`4`	`const A: [(); 5] = [(), (), (), (), ()];`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ note: inside `<std::ops::Range<usize> as SliceIndex<[()]>>::get_unchecked`
`8`	`8`	note: inside `core::slice::<impl [()]>::get_unchecked::<std::ops::Range<usize>>`
`9`	`9`	`--> $SRC_DIR/core/src/slice/mod.rs:LL:COL`
`10`	`10`	note: inside `B`
`11`		`- --> $DIR/ub-slice-get-unchecked.rs:7:27`
	`11`	`+ --> $DIR/ub-slice-get-unchecked.rs:8:27`
`12`	`12`	`\|`
`13`	`13`	`LL \| const B: &[()] = unsafe { A.get_unchecked(3..1) };`
`14`	`14`	`\| ^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// compile-flags: -Z print-type-sizes --crate-type=lib`
	`2`	`+// ignore-debug debug assertions will print more types`
`2`	`3`	`// build-pass`
`3`	`4`	`// ignore-pass`
`4`	`5`	// ^-- needed because `--pass check` does not emit the output needed.