Auto merge of #2438 - RalfJung:more-track-caller, r=RalfJung

adjust for more backtrace pruning

The Miri side of rust-lang/rust#99690. Those messages are much nicer. :) And we also need error-pattern much less.

Author: bors

rust-version

@@ -1 +1 @@
-7fe022f5aa32bbbb33c3a58755729d6667a461a9
+2fdbf075cf502431ca9fee6616331b32e34f25de

tests/fail/intrinsics/copy_overflow.rs

@@ -1,10 +1,10 @@
-//@error-pattern: overflow computing total size
 use std::mem;
 
 fn main() {
     let x = 0;
     let mut y = 0;
     unsafe {
         (&mut y as *mut i32).copy_from(&x, 1usize << (mem::size_of::<usize>() * 8 - 1));
+        //~^ERROR: overflow computing total size
     }
 }

tests/fail/intrinsics/copy_overflow.stderr

@@ -1,19 +1,13 @@
 error: Undefined Behavior: overflow computing total size of `copy`
-  --> RUSTLIB/core/src/intrinsics.rs:LL:CC
+  --> $DIR/copy_overflow.rs:LL:CC
    |
-LL |         copy(src, dst, count)
-   |         ^^^^^^^^^^^^^^^^^^^^^ overflow computing total size of `copy`
+LL |         (&mut y as *mut i32).copy_from(&x, 1usize << (mem::size_of::<usize>() * 8 - 1));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow computing total size of `copy`
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: backtrace:
-   = note: inside `std::intrinsics::copy::<i32>` at RUSTLIB/core/src/intrinsics.rs:LL:CC
-   = note: inside `std::ptr::mut_ptr::<impl *mut i32>::copy_from` at RUSTLIB/core/src/ptr/mut_ptr.rs:LL:CC
-note: inside `main` at $DIR/copy_overflow.rs:LL:CC
-  --> $DIR/copy_overflow.rs:LL:CC
-   |
-LL |         (&mut y as *mut i32).copy_from(&x, 1usize << (mem::size_of::<usize>() * 8 - 1));
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: inside `main` at $DIR/copy_overflow.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tests/fail/intrinsics/out_of_bounds_ptr_1.rs

@@ -1,8 +1,7 @@
-//@error-pattern: pointer to 5 bytes starting at offset 0 is out-of-bounds
 fn main() {
     let v = [0i8; 4];
     let x = &v as *const i8;
     // The error is inside another function, so we cannot match it by line
-    let x = unsafe { x.offset(5) };
+    let x = unsafe { x.offset(5) }; //~ERROR: pointer to 5 bytes starting at offset 0 is out-of-bounds
     panic!("this should never print: {:?}", x);
 }

tests/fail/intrinsics/out_of_bounds_ptr_1.stderr

@@ -1,18 +1,13 @@
 error: Undefined Behavior: out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 5 bytes starting at offset 0 is out-of-bounds
-  --> RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
+  --> $DIR/out_of_bounds_ptr_1.rs:LL:CC
    |
-LL |         unsafe { intrinsics::offset(self, count) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 5 bytes starting at offset 0 is out-of-bounds
+LL |     let x = unsafe { x.offset(5) };
+   |                      ^^^^^^^^^^^ out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 5 bytes starting at offset 0 is out-of-bounds
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: backtrace:
-   = note: inside `std::ptr::const_ptr::<impl *const i8>::offset` at RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
-note: inside `main` at $DIR/out_of_bounds_ptr_1.rs:LL:CC
-  --> $DIR/out_of_bounds_ptr_1.rs:LL:CC
-   |
-LL |     let x = unsafe { x.offset(5) };
-   |                      ^^^^^^^^^^^
+   = note: inside `main` at $DIR/out_of_bounds_ptr_1.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tests/fail/intrinsics/out_of_bounds_ptr_2.rs

@@ -1,7 +1,6 @@
-//@error-pattern: overflowing in-bounds pointer arithmetic
 fn main() {
     let v = [0i8; 4];
     let x = &v as *const i8;
-    let x = unsafe { x.offset(isize::MIN) };
+    let x = unsafe { x.offset(isize::MIN) }; //~ERROR: overflowing in-bounds pointer arithmetic
     panic!("this should never print: {:?}", x);
 }

tests/fail/intrinsics/out_of_bounds_ptr_2.stderr

@@ -1,18 +1,13 @@
 error: Undefined Behavior: overflowing in-bounds pointer arithmetic
-  --> RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
+  --> $DIR/out_of_bounds_ptr_2.rs:LL:CC
    |
-LL |         unsafe { intrinsics::offset(self, count) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflowing in-bounds pointer arithmetic
+LL |     let x = unsafe { x.offset(isize::MIN) };
+   |                      ^^^^^^^^^^^^^^^^^^^^ overflowing in-bounds pointer arithmetic
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: backtrace:
-   = note: inside `std::ptr::const_ptr::<impl *const i8>::offset` at RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
-note: inside `main` at $DIR/out_of_bounds_ptr_2.rs:LL:CC
-  --> $DIR/out_of_bounds_ptr_2.rs:LL:CC
-   |
-LL |     let x = unsafe { x.offset(isize::MIN) };
-   |                      ^^^^^^^^^^^^^^^^^^^^
+   = note: inside `main` at $DIR/out_of_bounds_ptr_2.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tests/fail/intrinsics/out_of_bounds_ptr_3.rs

@@ -1,7 +1,6 @@
-//@error-pattern: pointer to 1 byte starting at offset -1 is out-of-bounds
 fn main() {
     let v = [0i8; 4];
     let x = &v as *const i8;
-    let x = unsafe { x.offset(-1) };
+    let x = unsafe { x.offset(-1) }; //~ERROR: pointer to 1 byte starting at offset -1 is out-of-bounds
     panic!("this should never print: {:?}", x);
 }

tests/fail/intrinsics/out_of_bounds_ptr_3.stderr

@@ -1,18 +1,13 @@
 error: Undefined Behavior: out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 1 byte starting at offset -1 is out-of-bounds
-  --> RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
+  --> $DIR/out_of_bounds_ptr_3.rs:LL:CC
    |
-LL |         unsafe { intrinsics::offset(self, count) }
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 1 byte starting at offset -1 is out-of-bounds
+LL |     let x = unsafe { x.offset(-1) };
+   |                      ^^^^^^^^^^^^ out-of-bounds pointer arithmetic: ALLOC has size 4, so pointer to 1 byte starting at offset -1 is out-of-bounds
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: backtrace:
-   = note: inside `std::ptr::const_ptr::<impl *const i8>::offset` at RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC
-note: inside `main` at $DIR/out_of_bounds_ptr_3.rs:LL:CC
-  --> $DIR/out_of_bounds_ptr_3.rs:LL:CC
-   |
-LL |     let x = unsafe { x.offset(-1) };
-   |                      ^^^^^^^^^^^^
+   = note: inside `main` at $DIR/out_of_bounds_ptr_3.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tests/fail/intrinsics/overflowing-unchecked-rsh.rs

@@ -1,10 +1,8 @@
-#![feature(core_intrinsics)]
-
-use std::intrinsics::*;
+#![feature(unchecked_math)]
 
 fn main() {
     unsafe {
-        let _n = unchecked_shr(1i64, 64);
+        let _n = 1i64.unchecked_shr(64);
         //~^ ERROR: overflowing shift by 64 in `unchecked_shr`
     }
 }