diff options
| author | Ralf Jung <post@ralfj.de> | 2020-09-20 12:08:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 12:08:36 +0200 |
| commit | e5be14c2721ed4f4bf8b4c5c01a68de18cfd31a3 (patch) | |
| tree | eb898f692b83000bb21c6ee46be30a9c74d529ff | |
| parent | 70f55a78a32f8a34eb0386b8838f03baec2b2688 (diff) | |
| parent | 0810c3ef1971b87f05561b8da9947f52a5270f29 (diff) | |
Rollup merge of #76871 - RalfJung:miri-panic-abort, r=dtolnay
support panic=abort in Miri This is needed for https://github.com/rust-lang/miri/issues/1058 on Windows: we cannot run the inline-assembly versions of `abort`, so fall back to the intrinsic (which Miri supports).
| -rw-r--r-- | library/panic_abort/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs index 3b08a64b22d..e5800fbceb2 100644 --- a/library/panic_abort/src/lib.rs +++ b/library/panic_abort/src/lib.rs @@ -47,7 +47,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 |