normalize abort calls in miri tests

Author: joboet

library/std/src/sys/pal/unix/mod.rs

@@ -362,10 +362,17 @@ pub fn cvt_nz(error: libc::c_int) -> crate::io::Result<()> {
 // multithreaded C program.  It is much less severe for Rust, because Rust
 // stdlib doesn't use libc stdio buffering.  In a typical Rust program, which
 // does not use C stdio, even a buggy libc::abort() is, in fact, safe.
+#[cfg(not(miri))]
 pub fn abort_internal() -> ! {
     unsafe { libc::abort() }
 }
 
+#[cfg(miri)]
+pub fn abort_internal() -> ! {
+    // Using the intrinsic simplifies the miri UI tests.
+    crate::intrinsics::abort()
+}
+
 cfg_if::cfg_if! {
     if #[cfg(target_os = "android")] {
         #[link(name = "dl", kind = "static", modifiers = "-bundle",

library/std/src/sys/pal/windows/mod.rs

@@ -353,7 +353,7 @@ pub fn abort_internal() -> ! {
 
 #[cfg(miri)]
 pub fn abort_internal() -> ! {
-    crate::intrinsics::abort();
+    crate::intrinsics::abort()
 }
 
 /// Align the inner value to 8 bytes.

src/tools/miri/tests/fail/alloc/alloc_error_handler.rs

@@ -1,5 +1,4 @@
 //@error-in-other-file: aborted
-//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 #![feature(allocator_api)]
 

src/tools/miri/tests/fail/alloc/alloc_error_handler.stderr

@@ -2,7 +2,7 @@ memory allocation of 4 bytes failed
 error: abnormal termination: the program aborted execution
   --> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
    |
-LL |     ABORT();
+LL |     crate::intrinsics::abort()
    | ^ the program aborted execution
    |
    = note: BACKTRACE:

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

@@ -11,7 +11,7 @@ thread caused non-unwinding panic. aborting.
 error: abnormal termination: the program aborted execution
   --> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
    |
-LL |     ABORT();
+LL |     crate::intrinsics::abort()
    | ^ the program aborted execution
    |
    = note: BACKTRACE:

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

@@ -11,7 +11,7 @@ thread caused non-unwinding panic. aborting.
 error: abnormal termination: the program aborted execution
   --> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
    |
-LL |     ABORT();
+LL |     crate::intrinsics::abort()
    | ^ the program aborted execution
    |
    = note: BACKTRACE:

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs

@@ -1,5 +1,4 @@
 //@revisions: extern_block definition both
-//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
 //@normalize-stderr-test: "\n +at [^\n]+" -> ""

src/tools/miri/tests/fail/intrinsics/uninit_uninhabited_type.rs

@@ -1,4 +1,3 @@
-//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
 //@normalize-stderr-test: "\n +at [^\n]+" -> ""

src/tools/miri/tests/fail/intrinsics/uninit_uninhabited_type.stderr

@@ -7,7 +7,7 @@ thread caused non-unwinding panic. aborting.
 error: abnormal termination: the program aborted execution
   --> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
    |
-LL |     ABORT();
+LL |     crate::intrinsics::abort()
    | ^ the program aborted execution
    |
    = note: BACKTRACE:

src/tools/miri/tests/fail/intrinsics/zero_fn_ptr.rs

@@ -1,4 +1,3 @@
-//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
 //@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
 //@normalize-stderr-test: "\n +at [^\n]+" -> ""