re-add miri intrinsic ABI check

rust-lang · Nov 16, 2019 · 405866a · 405866a
1 parent 1d8b6ce
commit 405866a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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)?;