about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-03-14 11:23:39 +0100
committerRalf Jung <post@ralfj.de>2020-03-14 11:24:11 +0100
commit9c5d8e9b520c12044c818dd3d48f02bcea075ec3 (patch)
tree784caf6fbc79840b3c726f0fe3d82bdd913ce445 /src/libcore
parent62087439a46f09b6a6716fc25b4a032f3d76eb71 (diff)
adjust Miri interaction with panic runtime
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/intrinsics.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index c2f13047e54..d722406b82b 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -1892,10 +1892,12 @@ 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.
+    /// ICEs when encountered during non-Miri codegen.
     ///
-    /// Perma-unstable: do not use
-    pub fn miri_start_panic(data: *mut (dyn crate::any::Any + crate::marker::Send)) -> ();
+    /// The `payload` ptr here will be exactly the one `do_catch` gets passed by `try`.
+    ///
+    /// Perma-unstable: do not use.
+    pub fn miri_start_panic(payload: *mut u8) -> !;
 }
 
 // Some functions are defined here because they accidentally got made