File tree 1 file changed +6
-2
lines changed
library/std/src/sys/pal/windows 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -321,8 +321,8 @@ pub fn dur2timeout(dur: Duration) -> c::DWORD {
321
321
///
322
322
/// This is the same implementation as in libpanic_abort's `__rust_start_panic`. See
323
323
/// that function for more information on `__fastfail`
324
+ #[ cfg( not( miri) ) ] // inline assembly does not work in Miri
324
325
pub fn abort_internal ( ) -> ! {
325
- #[ cfg( not( miri) ) ] // inline assembly does not work in Miri
326
326
unsafe {
327
327
cfg_if:: cfg_if! {
328
328
if #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ] {
@@ -336,7 +336,11 @@ pub fn abort_internal() -> ! {
336
336
}
337
337
}
338
338
}
339
- #[ cfg( miri) ]
339
+ }
340
+
341
+ // miri is sensitive to changes here so check miri is happy if touching this
342
+ #[ cfg( miri) ]
343
+ pub fn abort_internal ( ) -> ! {
340
344
core:: intrinsics:: abort ( )
341
345
}
342
346
You can’t perform that action at this time.
0 commit comments