diff options
| author | bors <bors@rust-lang.org> | 2019-12-02 08:35:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-02 08:35:24 +0000 |
| commit | 4af3ee8ee2a2bc1286b021db7600ba990359cf3f (patch) | |
| tree | 8631bfc4d4f6746bdc573f206f8f5edf4bbdfc74 /src/libcore | |
| parent | f5c81e0a986e4285d3d0fd781a1bd475753eb12c (diff) | |
| parent | 910e83eab2f65dd922f8d980c71840a68b3d7c6a (diff) | |
| download | rust-4af3ee8ee2a2bc1286b021db7600ba990359cf3f.tar.gz rust-4af3ee8ee2a2bc1286b021db7600ba990359cf3f.zip | |
Auto merge of #66950 - RalfJung:rollup-12d0zx8, r=RalfJung
Rollup of 5 pull requests Successful merges: - #66245 (Conditional compilation for sanitizers) - #66654 (Handle const-checks for `&mut` outside of `HasMutInterior`) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66834 (rustbuild fixes) Failed merges: r? @ghost
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 |