diff options
| author | Ralf Jung <post@ralfj.de> | 2019-12-02 09:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-02 09:34:12 +0100 |
| commit | b7f8b77eec41b47f5cb49bce53dc34c7e87269c7 (patch) | |
| tree | e12baa06bbcdd5f2f48188de2e99435c268c8645 /src/libcore | |
| parent | f32f56969c6c0e4d43b2ca9a6d5254c64ae1cd91 (diff) | |
| parent | 02b66a19010c76e41805e65179e951ad1d41e0c7 (diff) | |
| download | rust-b7f8b77eec41b47f5cb49bce53dc34c7e87269c7.tar.gz rust-b7f8b77eec41b47f5cb49bce53dc34c7e87269c7.zip | |
Rollup merge of #66822 - RalfJung:miri-panic, r=oli-obk
libunwind_panic: adjust miri panic hack We adjust the Miri hack in libpanic_unwind such that even with `cfg(miri)`, we build a version of libpanic_unwind that actually works. This is needed to resolve https://github.com/integer32llc/rust-playground/issues/548. r? @oli-obk @alexcrichton
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 |