From 405866aaa3e8057218ad482ca60e284ea0c9e350 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 16 Nov 2019 11:44:32 +0100
Subject: [PATCH] re-add miri intrinsic ABI check

---
 src/librustc_mir/interpret/terminator.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/librustc_mir/interpret/terminator.rs b/src/librustc_mir/interpret/terminator.rs
index 4f9e404b2c63..0134c77808b8 100644
--- a/src/librustc_mir/interpret/terminator.rs
+++ b/src/librustc_mir/interpret/terminator.rs
@@ -264,6 +264,11 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
         match instance.def {
             ty::InstanceDef::Intrinsic(..) => {
+                if caller_abi != Abi::RustIntrinsic && caller_abi != Abi::PlatformIntrinsic {
+                    throw_ub_format!("Rust intrinsic called with an ABI other than \
+                        `RustIntrinsic` and `PlatformIntrinsic`.");
+                }
+
                 let old_stack = self.cur_frame();
                 let old_bb = self.frame().block;
                 M::call_intrinsic(self, span, instance, args, dest, ret, unwind)?;