diff options
| author | Ralf Jung <post@ralfj.de> | 2019-11-27 20:39:53 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-11-30 10:13:25 +0100 |
| commit | 02b66a19010c76e41805e65179e951ad1d41e0c7 (patch) | |
| tree | eaa4d9c5db0e3ae3faddc295eb65a873f3f44d60 /src/libcore | |
| parent | 8f1bbd69e13c9e04a4c2b75612bc0c31af972439 (diff) | |
| download | rust-02b66a19010c76e41805e65179e951ad1d41e0c7.tar.gz rust-02b66a19010c76e41805e65179e951ad1d41e0c7.zip | |
libunwind_panic: adjust miri panic hack
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/intrinsics.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index e3dc5630c94..d4952f53bf7 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -1348,9 +1348,11 @@ extern "rust-intrinsic" { pub fn ptr_offset_from<T>(ptr: *const T, base: *const T) -> isize; /// Internal hook used by Miri to implement unwinding. + /// Compiles to a NOP during non-Miri codegen. + /// /// Perma-unstable: do not use #[cfg(not(bootstrap))] - pub fn miri_start_panic(data: *mut (dyn crate::any::Any + crate::marker::Send)) -> !; + pub fn miri_start_panic(data: *mut (dyn crate::any::Any + crate::marker::Send)) -> (); } // Some functions are defined here because they accidentally got made |