Rollup merge of rust-lang#76871 - RalfJung:miri-panic-abort, r=dtolnay

Dylan-DPC · web-flow · commit 6144a3e177b1 · 2020-09-20T01:41:57.000+02:00
support panic=abort in Miri This is needed for rust-lang/miri#1058 on Windows: we cannot run the inline-assembly versions of `abort`, so fall back to the intrinsic (which Miri supports).
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs
@@ -46,7 +46,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
                 }
                 __rust_abort();
             }
-        } else if #[cfg(windows)] {
+        } else if #[cfg(all(windows, not(miri)))] {
             // On Windows, use the processor-specific __fastfail mechanism. In Windows 8
             // and later, this will terminate the process immediately without running any
             // in-process exception handlers. In earlier versions of Windows, this

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {`
`46`	`46`	`}`
`47`	`47`	`__rust_abort();`
`48`	`48`	`}`
`49`		`- } else if #[cfg(windows)] {`
	`49`	`+ } else if #[cfg(all(windows, not(miri)))] {`
`50`	`50`	`// On Windows, use the processor-specific __fastfail mechanism. In Windows 8`
`51`	`51`	`// and later, this will terminate the process immediately without running any`
`52`	`52`	`// in-process exception handlers. In earlier versions of Windows, this`