bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
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).
This commit is contained in:
Ralf Jung 2020-09-20 12:08:36 +02:00 • committed by GitHub
commit e5be14c272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/panic_abort/src/lib.rs
View file

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