Remove duplicated span from const eval frame list

estebank · estebank · commit 14895b34c373 · 2025-02-03T19:45:39.000Z
When the primary span for a const error is the same as the first frame in the const error report, skip it.

```
error[E0080]: evaluation of constant value failed
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:10:5
   |
LL |     panic!()
   |     ^^^^^^^^ explicit panic
   |
note: inside `_CONST`
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:3:24
   |
LL | const _CONST: &amp;[u8] = &amp;f(&amp;[], |_| {});
   |                        ^^^^^^^^^^^^^^
   = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
instead of
```
error[E0080]: evaluation of constant value failed
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:10:5
   |
LL |     panic!()
   |     ^^^^^^^^ explicit panic
   |
note: inside `f::&lt;{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}&gt;`
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:10:5
   |
LL |     panic!()
   |     ^^^^^^^^
note: inside `_CONST`
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:3:24
   |
LL | const _CONST: &amp;[u8] = &amp;f(&amp;[], |_| {});
   |                        ^^^^^^^^^^^^^^
   = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)

note: erroneous constant encountered
  --&gt; $DIR/issue-88434-removal-index-should-be-less.rs:3:23
   |
LL | const _CONST: &amp;[u8] = &amp;f(&amp;[], |_| {});
   |                       ^^^^^^^^^^^^^^^
```
diff --git a/compiler/rustc_const_eval/src/const_eval/error.rs b/compiler/rustc_const_eval/src/const_eval/error.rs
@@ -147,8 +147,11 @@ where
         }
         // Report remaining errors.
         _ => {
-            let (our_span, frames) = get_span_and_frames();
+            let (our_span, mut frames) = get_span_and_frames();
             let span = span.substitute_dummy(our_span);
+            if Some(span) == frames.get(0).map(|frame| frame.span) {
+                frames.remove(0);
+            }
             let err = mk(span, frames);
             let mut err = tcx.dcx().create_err(err);
             // We allow invalid programs in infallible promoteds since invalid layouts can occur
diff --git a/tests/ui/borrowck/issue-81899.stderr b/tests/ui/borrowck/issue-81899.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!()
    |     ^^^^^^^^ explicit panic
    |
-note: inside `f::<{closure@$DIR/issue-81899.rs:4:31: 4:34}>`
-  --> $DIR/issue-81899.rs:11:5
-   |
-LL |     panic!()
-   |     ^^^^^^^^
 note: inside `_CONST`
   --> $DIR/issue-81899.rs:4:24
    |
diff --git a/tests/ui/borrowck/issue-88434-minimal-example.stderr b/tests/ui/borrowck/issue-88434-minimal-example.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!()
    |     ^^^^^^^^ explicit panic
    |
-note: inside `f::<{closure@$DIR/issue-88434-minimal-example.rs:3:25: 3:28}>`
-  --> $DIR/issue-88434-minimal-example.rs:10:5
-   |
-LL |     panic!()
-   |     ^^^^^^^^
 note: inside `_CONST`
   --> $DIR/issue-88434-minimal-example.rs:3:22
    |
diff --git a/tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr b/tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!()
    |     ^^^^^^^^ explicit panic
    |
-note: inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
-  --> $DIR/issue-88434-removal-index-should-be-less.rs:10:5
-   |
-LL |     panic!()
-   |     ^^^^^^^^
 note: inside `_CONST`
   --> $DIR/issue-88434-removal-index-should-be-less.rs:3:24
    |
diff --git a/tests/ui/coherence/const-errs-dont-conflict-103369.stderr b/tests/ui/coherence/const-errs-dont-conflict-103369.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!("Some error occurred");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some error occurred
    |
-note: inside `my_fn`
-  --> $DIR/const-errs-dont-conflict-103369.rs:10:5
-   |
-LL |     panic!("Some error occurred");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `<() as ConstGenericTrait<{my_fn(1)}>>::{constant#0}`
   --> $DIR/const-errs-dont-conflict-103369.rs:5:25
    |
@@ -22,11 +17,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!("Some error occurred");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some error occurred
    |
-note: inside `my_fn`
-  --> $DIR/const-errs-dont-conflict-103369.rs:10:5
-   |
-LL |     panic!("Some error occurred");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `<() as ConstGenericTrait<{my_fn(2)}>>::{constant#0}`
   --> $DIR/const-errs-dont-conflict-103369.rs:7:25
    |
diff --git a/tests/ui/const-generics/issues/issue-100313.stderr b/tests/ui/const-generics/issues/issue-100313.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |             *(B as *const bool as *mut bool) = false;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ writing to ALLOC0 which is read-only
    |
-note: inside `T::<&true>::set_false`
-  --> $DIR/issue-100313.rs:9:13
-   |
-LL |             *(B as *const bool as *mut bool) = false;
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `_`
   --> $DIR/issue-100313.rs:17:5
    |
diff --git a/tests/ui/const-ptr/forbidden_slices.stderr b/tests/ui/const-ptr/forbidden_slices.stderr
@@ -104,8 +104,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize
    |
-note: inside `std::ptr::const_ptr::<impl *const ()>::sub_ptr`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `from_ptr_range::<'_, ()>`
   --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
 note: inside `R1`
@@ -120,8 +118,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC10 which is only 4 bytes from the end of the allocation
    |
-note: inside `std::ptr::const_ptr::<impl *const u32>::add`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `R2`
   --> $DIR/forbidden_slices.rs:53:25
    |
@@ -179,8 +175,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC11+0x1 which is only 7 bytes from the end of the allocation
    |
-note: inside `std::ptr::const_ptr::<impl *const u64>::add`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `R8`
   --> $DIR/forbidden_slices.rs:77:25
    |
@@ -192,8 +186,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: `ptr_offset_from_unsigned` called on pointers into different allocations
    |
-note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `from_ptr_range::<'_, u32>`
   --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
 note: inside `R9`
@@ -207,8 +199,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: `ptr_offset_from_unsigned` called on pointers into different allocations
    |
-note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `from_ptr_range::<'_, u32>`
   --> $SRC_DIR/core/src/slice/raw.rs:LL:COL
 note: inside `R10`
diff --git a/tests/ui/const-ptr/out_of_bounds_read.stderr b/tests/ui/const-ptr/out_of_bounds_read.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes
    |
-note: inside `std::ptr::read::<u32>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `_READ`
   --> $DIR/out_of_bounds_read.rs:10:33
    |
@@ -16,8 +14,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes
    |
-note: inside `std::ptr::read::<u32>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::const_ptr::<impl *const u32>::read`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `_CONST_READ`
@@ -31,8 +27,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes
    |
-note: inside `std::ptr::read::<u32>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::mut_ptr::<impl *mut u32>::read`
   --> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
 note: inside `_MUT_READ`
diff --git a/tests/ui/consts/const-eval/const_fn_ptr_fail2.stderr b/tests/ui/consts/const-eval/const_fn_ptr_fail2.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     x(y)
    |     ^^^^ calling non-const function `double`
    |
-note: inside `bar`
-  --> $DIR/const_fn_ptr_fail2.rs:9:5
-   |
-LL |     x(y)
-   |     ^^^^
 note: inside `Y`
   --> $DIR/const_fn_ptr_fail2.rs:14:18
    |
@@ -21,11 +16,6 @@ error[E0080]: evaluation of constant value failed
 LL |     x(y)
    |     ^^^^ calling non-const function `double`
    |
-note: inside `bar`
-  --> $DIR/const_fn_ptr_fail2.rs:9:5
-   |
-LL |     x(y)
-   |     ^^^^
 note: inside `Z`
   --> $DIR/const_fn_ptr_fail2.rs:15:18
    |
diff --git a/tests/ui/consts/const-eval/const_panic_track_caller.rs b/tests/ui/consts/const-eval/const_panic_track_caller.rs
@@ -15,7 +15,6 @@ const fn c() -> u32 {
     b()
     //~^ ERROR evaluation of constant value failed
     //~| NOTE hey
-    //~| NOTE inside
 }
 
 const X: u32 = c();
diff --git a/tests/ui/consts/const-eval/const_panic_track_caller.stderr b/tests/ui/consts/const-eval/const_panic_track_caller.stderr
@@ -4,13 +4,8 @@ error[E0080]: evaluation of constant value failed
 LL |     b()
    |     ^^^ hey
    |
-note: inside `c`
-  --> $DIR/const_panic_track_caller.rs:15:5
-   |
-LL |     b()
-   |     ^^^
 note: inside `X`
-  --> $DIR/const_panic_track_caller.rs:21:16
+  --> $DIR/const_panic_track_caller.rs:20:16
    |
 LL | const X: u32 = c();
    |                ^^^
diff --git a/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr b/tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |         let _ = intrinsics::const_allocate(4, 3) as *mut i32;
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid align passed to `const_allocate`: 3 is not a power of 2
    |
-note: inside `foo`
-  --> $DIR/alloc_intrinsic_errors.rs:8:17
-   |
-LL |         let _ = intrinsics::const_allocate(4, 3) as *mut i32;
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `FOO`
   --> $DIR/alloc_intrinsic_errors.rs:5:18
    |
diff --git a/tests/ui/consts/const-eval/parse_ints.stderr b/tests/ui/consts/const-eval/parse_ints.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: from_ascii_radix: radix must lie in the range `[2, 36]`
    |
-note: inside `core::num::<impl u64>::from_ascii_radix`
-  --> $SRC_DIR/core/src/num/mod.rs:LL:COL
 note: inside `core::num::<impl u64>::from_str_radix`
   --> $SRC_DIR/core/src/num/mod.rs:LL:COL
 note: inside `_TOO_LOW`
@@ -19,8 +17,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: from_ascii_radix: radix must lie in the range `[2, 36]`
    |
-note: inside `core::num::<impl u64>::from_ascii_radix`
-  --> $SRC_DIR/core/src/num/mod.rs:LL:COL
 note: inside `core::num::<impl u64>::from_str_radix`
   --> $SRC_DIR/core/src/num/mod.rs:LL:COL
 note: inside `_TOO_HIGH`
diff --git a/tests/ui/consts/const-eval/raw-pointer-ub.stderr b/tests/ui/consts/const-eval/raw-pointer-ub.stderr
@@ -15,8 +15,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: accessing memory with alignment 1, but alignment 4 is required
    |
-note: inside `copy_nonoverlapping::<u32>`
-  --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
 note: inside `std::ptr::const_ptr::<impl *const u32>::copy_to_nonoverlapping`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `MISALIGNED_COPY`
diff --git a/tests/ui/consts/const-eval/transmute-size-mismatch.stderr b/tests/ui/consts/const-eval/transmute-size-mismatch.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |             RET = CastTransmute(x);
    |             ^^^^^^^^^^^^^^^^^^^^^^ transmuting from 4-byte type to 2-byte type: `i32` -> `u16`
    |
-note: inside `mir_transmute::<i32, u16>`
-  --> $DIR/transmute-size-mismatch.rs:12:13
-   |
-LL |             RET = CastTransmute(x);
-   |             ^^^^^^^^^^^^^^^^^^^^^^
 note: inside `FROM_BIGGER`
   --> $DIR/transmute-size-mismatch.rs:20:35
    |
@@ -21,11 +16,6 @@ error[E0080]: evaluation of constant value failed
 LL |             RET = CastTransmute(x);
    |             ^^^^^^^^^^^^^^^^^^^^^^ transmuting from 2-byte type to 4-byte type: `i16` -> `u32`
    |
-note: inside `mir_transmute::<i16, u32>`
-  --> $DIR/transmute-size-mismatch.rs:12:13
-   |
-LL |             RET = CastTransmute(x);
-   |             ^^^^^^^^^^^^^^^^^^^^^^
 note: inside `FROM_SMALLER`
   --> $DIR/transmute-size-mismatch.rs:22:36
    |
diff --git a/tests/ui/consts/const-eval/ub-enum.stderr b/tests/ui/consts/const-eval/ub-enum.stderr
@@ -121,8 +121,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: read discriminant of an uninhabited enum variant
    |
-note: inside `discriminant::<Never>`
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
 note: inside `TEST_ICE_89765`
   --> $DIR/ub-enum.rs:103:14
    |
diff --git a/tests/ui/consts/const-eval/ub-invalid-values.stderr b/tests/ui/consts/const-eval/ub-invalid-values.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     let _val = *ptr as u32;
    |                ^^^^^^^^^^^ interpreting an invalid 8-bit value as a bool: 0x03
    |
-note: inside `bool_cast`
-  --> $DIR/ub-invalid-values.rs:2:16
-   |
-LL |     let _val = *ptr as u32;
-   |                ^^^^^^^^^^^
 note: inside `_`
   --> $DIR/ub-invalid-values.rs:8:5
    |
diff --git a/tests/ui/consts/const-eval/ub-ref-ptr.stderr b/tests/ui/consts/const-eval/ub-ref-ptr.stderr
@@ -153,8 +153,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: accessing memory based on pointer with alignment 1, but alignment 4 is required
    |
-note: inside `std::ptr::read::<u32>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::const_ptr::<impl *const u32>::read`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `UNALIGNED_READ`
diff --git a/tests/ui/consts/const-eval/unwind-abort.stderr b/tests/ui/consts/const-eval/unwind-abort.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     panic!()
    |     ^^^^^^^^ explicit panic
    |
-note: inside `foo`
-  --> $DIR/unwind-abort.rs:2:5
-   |
-LL |     panic!()
-   |     ^^^^^^^^
 note: inside `_`
   --> $DIR/unwind-abort.rs:5:15
    |
diff --git a/tests/ui/consts/const-eval/validate_uninhabited_zsts.stderr b/tests/ui/consts/const-eval/validate_uninhabited_zsts.stderr
@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     unsafe { std::mem::transmute(()) }
    |              ^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a value of the never type `!`
    |
-note: inside `foo`
-  --> $DIR/validate_uninhabited_zsts.rs:2:14
-   |
-LL |     unsafe { std::mem::transmute(()) }
-   |              ^^^^^^^^^^^^^^^^^^^^^^^
 note: inside `FOO`
   --> $DIR/validate_uninhabited_zsts.rs:16:33
    |
diff --git a/tests/ui/consts/const-ptr-is-null.stderr b/tests/ui/consts/const-ptr-is-null.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: null-ness of this pointer cannot be determined in const context
    |
-note: inside `std::ptr::const_ptr::<impl *const T>::is_null::compiletime`
-  --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `std::ptr::const_ptr::<impl *const i32>::is_null`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `MAYBE_NULL`
diff --git a/tests/ui/consts/const_unsafe_unreachable_ub.stderr b/tests/ui/consts/const_unsafe_unreachable_ub.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: entering unreachable code
    |
-note: inside `unreachable_unchecked`
-  --> $SRC_DIR/core/src/hint.rs:LL:COL
 note: inside `foo`
   --> $DIR/const_unsafe_unreachable_ub.rs:6:18
    |
diff --git a/tests/ui/consts/issue-miri-1910.stderr b/tests/ui/consts/issue-miri-1910.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: unable to turn pointer into integer
    |
-note: inside `std::ptr::read::<u8>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::const_ptr::<impl *const u8>::read`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `C`
diff --git a/tests/ui/consts/miri_unleashed/abi-mismatch.rs b/tests/ui/consts/miri_unleashed/abi-mismatch.rs
@@ -7,7 +7,6 @@ const fn call_rust_fn(my_fn: extern "Rust" fn()) {
     my_fn();
     //~^ ERROR could not evaluate static initializer
     //~| NOTE calling a function with calling convention C using calling convention Rust
-    //~| NOTE inside `call_rust_fn`
 }
 
 static VAL: () = call_rust_fn(unsafe { std::mem::transmute(c_fn as extern "C" fn()) });
diff --git a/tests/ui/consts/miri_unleashed/abi-mismatch.stderr b/tests/ui/consts/miri_unleashed/abi-mismatch.stderr
@@ -4,13 +4,8 @@ error[E0080]: could not evaluate static initializer
 LL |     my_fn();
    |     ^^^^^^^ calling a function with calling convention C using calling convention Rust
    |
-note: inside `call_rust_fn`
-  --> $DIR/abi-mismatch.rs:7:5
-   |
-LL |     my_fn();
-   |     ^^^^^^^
 note: inside `VAL`
-  --> $DIR/abi-mismatch.rs:13:18
+  --> $DIR/abi-mismatch.rs:12:18
    |
 LL | static VAL: () = call_rust_fn(unsafe { std::mem::transmute(c_fn as extern "C" fn()) });
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/miri_unleashed/assoc_const.stderr b/tests/ui/consts/miri_unleashed/assoc_const.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of `<String as Bar<Vec<u32>, String>>::F` failed
    |
    = note: calling non-const function `<Vec<u32> as Drop>::drop`
    |
-note: inside `std::ptr::drop_in_place::<Vec<u32>> - shim(Some(Vec<u32>))`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::drop_in_place::<(Vec<u32>, u32)> - shim(Some((Vec<u32>, u32)))`
   --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `<String as Bar<Vec<u32>, String>>::F`
diff --git a/tests/ui/consts/miri_unleashed/drop.stderr b/tests/ui/consts/miri_unleashed/drop.stderr
@@ -3,8 +3,6 @@ error[E0080]: could not evaluate static initializer
    |
    = note: calling non-const function `<Vec<i32> as Drop>::drop`
    |
-note: inside `std::ptr::drop_in_place::<Vec<i32>> - shim(Some(Vec<i32>))`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `TEST_BAD`
   --> $DIR/drop.rs:17:1
    |
diff --git a/tests/ui/consts/missing_span_in_backtrace.stderr b/tests/ui/consts/missing_span_in_backtrace.stderr
@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed
    |
    = note: unable to copy parts of a pointer from memory at ALLOC0
    |
-note: inside `std::ptr::read::<MaybeUninit<MaybeUninit<u8>>>`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `std::ptr::swap_nonoverlapping_simple_untyped::<MaybeUninit<u8>>`
   --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
 note: inside `swap_nonoverlapping::compiletime::<MaybeUninit<u8>>`
diff --git a/tests/ui/consts/offset_from_ub.stderr b/tests/ui/consts/offset_from_ub.stderr
diff --git a/tests/ui/consts/offset_ub.stderr b/tests/ui/consts/offset_ub.stderr
diff --git a/tests/ui/consts/qualif-indirect-mutation-fail.stderr b/tests/ui/consts/qualif-indirect-mutation-fail.stderr
diff --git a/tests/ui/consts/recursive.stderr b/tests/ui/consts/recursive.stderr
diff --git a/tests/ui/consts/required-consts/interpret-in-promoted.noopt.stderr b/tests/ui/consts/required-consts/interpret-in-promoted.noopt.stderr
diff --git a/tests/ui/consts/required-consts/interpret-in-promoted.opt.stderr b/tests/ui/consts/required-consts/interpret-in-promoted.opt.stderr
diff --git a/tests/ui/consts/uninhabited-const-issue-61744.stderr b/tests/ui/consts/uninhabited-const-issue-61744.stderr
diff --git a/tests/ui/explicit-tail-calls/ctfe-id-unlimited.return.stderr b/tests/ui/explicit-tail-calls/ctfe-id-unlimited.return.stderr
diff --git a/tests/ui/explicit-tail-calls/ctfe-tail-call-panic.rs b/tests/ui/explicit-tail-calls/ctfe-tail-call-panic.rs
diff --git a/tests/ui/explicit-tail-calls/ctfe-tail-call-panic.stderr b/tests/ui/explicit-tail-calls/ctfe-tail-call-panic.stderr
diff --git a/tests/ui/infinite/infinite-recursion-const-fn.stderr b/tests/ui/infinite/infinite-recursion-const-fn.stderr
diff --git a/tests/ui/layout/invalid-unsized-in-always-sized-tail.stderr b/tests/ui/layout/invalid-unsized-in-always-sized-tail.stderr
diff --git a/tests/ui/layout/unknown-when-no-type-parameter.stderr b/tests/ui/layout/unknown-when-no-type-parameter.stderr
diff --git a/tests/ui/limits/issue-55878.stderr b/tests/ui/limits/issue-55878.stderr

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed`
`4`	`4`	`LL \| panic!()`
`5`	`5`	`\| ^^^^^^^^ explicit panic`
`6`	`6`	`\|`
`7`		-note: inside `f::<{closure@$DIR/issue-81899.rs:4:31: 4:34}>`
`8`		`- --> $DIR/issue-81899.rs:11:5`
`9`		`- \|`
`10`		`-LL \| panic!()`
`11`		`- \| ^^^^^^^^`
`12`	`7`	note: inside `_CONST`
`13`	`8`	`--> $DIR/issue-81899.rs:4:24`
`14`	`9`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed`
`4`	`4`	`LL \| panic!("Some error occurred");`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some error occurred`
`6`	`6`	`\|`
`7`		-note: inside `my_fn`
`8`		`- --> $DIR/const-errs-dont-conflict-103369.rs:10:5`
`9`		`- \|`
`10`		`-LL \| panic!("Some error occurred");`
`11`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`7`	note: inside `<() as ConstGenericTrait<{my_fn(1)}>>::{constant#0}`
`13`	`8`	`--> $DIR/const-errs-dont-conflict-103369.rs:5:25`
`14`	`9`	`\|`
`@@ -22,11 +17,6 @@ error[E0080]: evaluation of constant value failed`
`22`	`17`	`LL \| panic!("Some error occurred");`
`23`	`18`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some error occurred`
`24`	`19`	`\|`
`25`		-note: inside `my_fn`
`26`		`- --> $DIR/const-errs-dont-conflict-103369.rs:10:5`
`27`		`- \|`
`28`		`-LL \| panic!("Some error occurred");`
`29`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`30`	`20`	note: inside `<() as ConstGenericTrait<{my_fn(2)}>>::{constant#0}`
`31`	`21`	`--> $DIR/const-errs-dont-conflict-103369.rs:7:25`
`32`	`22`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed`
`4`	`4`	`LL \| (B as const bool as *mut bool) = false;`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ writing to ALLOC0 which is read-only`
`6`	`6`	`\|`
`7`		-note: inside `T::<&true>::set_false`
`8`		`- --> $DIR/issue-100313.rs:9:13`
`9`		`- \|`
`10`		`-LL \| (B as const bool as *mut bool) = false;`
`11`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`7`	note: inside `_`
`13`	`8`	`--> $DIR/issue-100313.rs:17:5`
`14`	`9`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,6 @@ error[E0080]: could not evaluate static initializer`
`104`	`104`	`\|`
`105`	`105`	`= note: assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize`
`106`	`106`	`\|`
`107`		-note: inside `std::ptr::const_ptr::<impl *const ()>::sub_ptr`
`108`		`- --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`109`	`107`	note: inside `from_ptr_range::<'_, ()>`
`110`	`108`	`--> $SRC_DIR/core/src/slice/raw.rs:LL:COL`
`111`	`109`	note: inside `R1`
`@@ -120,8 +118,6 @@ error[E0080]: could not evaluate static initializer`
`120`	`118`	`\|`
`121`	`119`	`= note: out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC10 which is only 4 bytes from the end of the allocation`
`122`	`120`	`\|`
`123`		-note: inside `std::ptr::const_ptr::<impl *const u32>::add`
`124`		`- --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`125`	`121`	note: inside `R2`
`126`	`122`	`--> $DIR/forbidden_slices.rs:53:25`
`127`	`123`	`\|`
`@@ -179,8 +175,6 @@ error[E0080]: could not evaluate static initializer`
`179`	`175`	`\|`
`180`	`176`	`= note: out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC11+0x1 which is only 7 bytes from the end of the allocation`
`181`	`177`	`\|`
`182`		-note: inside `std::ptr::const_ptr::<impl *const u64>::add`
`183`		`- --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`184`	`178`	note: inside `R8`
`185`	`179`	`--> $DIR/forbidden_slices.rs:77:25`
`186`	`180`	`\|`
`@@ -192,8 +186,6 @@ error[E0080]: could not evaluate static initializer`
`192`	`186`	`\|`
`193`	`187`	= note: `ptr_offset_from_unsigned` called on pointers into different allocations
`194`	`188`	`\|`
`195`		-note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
`196`		`- --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`197`	`189`	note: inside `from_ptr_range::<'_, u32>`
`198`	`190`	`--> $SRC_DIR/core/src/slice/raw.rs:LL:COL`
`199`	`191`	note: inside `R9`
`@@ -207,8 +199,6 @@ error[E0080]: could not evaluate static initializer`
`207`	`199`	`\|`
`208`	`200`	= note: `ptr_offset_from_unsigned` called on pointers into different allocations
`209`	`201`	`\|`
`210`		-note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
`211`		`- --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`212`	`202`	note: inside `from_ptr_range::<'_, u32>`
`213`	`203`	`--> $SRC_DIR/core/src/slice/raw.rs:LL:COL`
`214`	`204`	note: inside `R10`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@ error[E0080]: evaluation of constant value failed`
`3`	`3`	`\|`
`4`	`4`	`= note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes`
`5`	`5`	`\|`
`6`		-note: inside `std::ptr::read::<u32>`
`7`		`- --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL`
`8`	`6`	note: inside `_READ`
`9`	`7`	`--> $DIR/out_of_bounds_read.rs:10:33`
`10`	`8`	`\|`
`@@ -16,8 +14,6 @@ error[E0080]: evaluation of constant value failed`
`16`	`14`	`\|`
`17`	`15`	`= note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes`
`18`	`16`	`\|`
`19`		-note: inside `std::ptr::read::<u32>`
`20`		`- --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL`
`21`	`17`	note: inside `std::ptr::const_ptr::<impl *const u32>::read`
`22`	`18`	`--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL`
`23`	`19`	note: inside `_CONST_READ`
`@@ -31,8 +27,6 @@ error[E0080]: evaluation of constant value failed`
`31`	`27`	`\|`
`32`	`28`	`= note: memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes`
`33`	`29`	`\|`
`34`		-note: inside `std::ptr::read::<u32>`
`35`		`- --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL`
`36`	`30`	note: inside `std::ptr::mut_ptr::<impl *mut u32>::read`
`37`	`31`	`--> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL`
`38`	`32`	note: inside `_MUT_READ`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ error[E0080]: evaluation of constant value failed`
`4`	`4`	`LL \| x(y)`
`5`	`5`	\| ^^^^ calling non-const function `double`
`6`	`6`	`\|`
`7`		-note: inside `bar`
`8`		`- --> $DIR/const_fn_ptr_fail2.rs:9:5`
`9`		`- \|`
`10`		`-LL \| x(y)`
`11`		`- \| ^^^^`
`12`	`7`	note: inside `Y`
`13`	`8`	`--> $DIR/const_fn_ptr_fail2.rs:14:18`
`14`	`9`	`\|`
`@@ -21,11 +16,6 @@ error[E0080]: evaluation of constant value failed`
`21`	`16`	`LL \| x(y)`
`22`	`17`	\| ^^^^ calling non-const function `double`
`23`	`18`	`\|`
`24`		-note: inside `bar`
`25`		`- --> $DIR/const_fn_ptr_fail2.rs:9:5`
`26`		`- \|`
`27`		`-LL \| x(y)`
`28`		`- \| ^^^^`
`29`	`19`	note: inside `Z`
`30`	`20`	`--> $DIR/const_fn_ptr_fail2.rs:15:18`
`31`	`21`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ const fn c() -> u32 {`
`15`	`15`	`b()`
`16`	`16`	`//~^ ERROR evaluation of constant value failed`
`17`	`17`	`//~\| NOTE hey`
`18`		`- //~\| NOTE inside`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`const X: u32 = c();`