make miri_start_panic intrinsic an FFI function

[rust.git] / src / shims / intrinsics.rs

diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index c44caed34f65a7b80f8d57b320b9f8b4c4f08a42..f542bebd82ad1b0f61310dac7fa3bc7fd60a3c14 100644 (file)
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -18,7 +18,7 @@ fn call_intrinsic(
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
-        unwind: Option<mir::BasicBlock>,
+        _unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
         let intrinsic_name = this.tcx.item_name(instance.def_id());
@@ -32,13 +32,10 @@ fn call_intrinsic(
             return Ok(());
         }
 
-        // First handle intrinsics without return place.
+        // All supported intrinsics have a return place.
         let intrinsic_name = &*intrinsic_name.as_str();
         let (dest, ret) = match ret {
-            None => match intrinsic_name {
-                "miri_start_panic" => return this.handle_miri_start_panic(args, unwind),
-                _ => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),
-            },
+            None => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),
             Some(p) => p,
         };