stronger normalization of mir-validation ICE

Author: RalfJung

src/tools/miri/src/diagnostics.rs

@@ -291,7 +291,7 @@ pub fn report_error<'tcx, 'mir>(
                     ValidationErrorKind::PointerAsInt { .. } | ValidationErrorKind::PartialPointer
                 ) =>
             {
-                ecx.handle_ice(); // print interpreter backtrace
+                ecx.handle_ice(); // print interpreter backtrace (this is outside the eval `catch_unwind`)
                 bug!(
                     "This validation error should be impossible in Miri: {}",
                     format_interp_error(ecx.tcx.dcx(), e)
@@ -308,7 +308,7 @@ pub fn report_error<'tcx, 'mir>(
                 InvalidProgramInfo::AlreadyReported(_) | InvalidProgramInfo::Layout(..),
             ) => "post-monomorphization error",
             _ => {
-                ecx.handle_ice(); // print interpreter backtrace
+                ecx.handle_ice(); // print interpreter backtrace (this is outside the eval `catch_unwind`)
                 bug!(
                     "This error should be impossible in Miri: {}",
                     format_interp_error(ecx.tcx.dcx(), e)

src/tools/miri/tests/panic/mir-validation.rs

@@ -1,10 +1,15 @@
 //! Ensure that the MIR validator runs on Miri's input.
 //@rustc-env:RUSTC_ICE=0
-//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
-//@normalize-stderr-test: "\n +at [^\n]+" -> ""
-//@normalize-stderr-test: "\n +\[\.\.\. omitted [0-9]+ frames? \.\.\.\]" -> ""
+//@normalize-stderr-test: "\n +[0-9]+:.+" -> ""
+//@normalize-stderr-test: "\n +at .+" -> ""
+//@normalize-stderr-test: "\n +\[\.\.\. omitted [0-9]+ frames? \.\.\.\].*" -> ""
 //@normalize-stderr-test: "\n[ =]*note:.*" -> ""
 //@normalize-stderr-test: "DefId\([^()]*\)" -> "DefId"
+// Somehow on rustc Windows CI, the "Miri caused an ICE" message is not shown.
+//@normalize-stderr-test: "\nMiri caused an ICE .*" -> ""
+//@normalize-stderr-test: "\n *--> .*" -> ""
+//@normalize-stderr-test: "\n(LL)? +\|.*" -> ""
+//@normalize-stderr-test: "\n(\n)+" -> "$1"
 #![feature(custom_mir, core_intrinsics)]
 use core::intrinsics::mir::*;
 

src/tools/miri/tests/panic/mir-validation.stderr

@@ -2,20 +2,7 @@ thread 'rustc' panicked at compiler/rustc_const_eval/src/transform/validate.rs:L
 broken MIR in Item(DefId) (after phase change to runtime-optimized) at bb0[1]:
 (*(_2.0: *mut i32)), has deref at the wrong place
 stack backtrace:
-
 error: the compiler unexpectedly panicked. this is a bug.
-
-
-
-
 query stack during panic:
 #0 [optimized_mir] optimizing MIR for `main`
 end of query stack
-
-Miri caused an ICE during evaluation. Here's the interpreter backtrace at the time of the panic:
-  --> RUSTLIB/core/src/ops/function.rs:LL:CC
-   |
-LL |     extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-