From c6ae57cb8343d19d05e364ac9391b0a04327faa7 Mon Sep 17 00:00:00 2001
From: hyd-dev <yd-huang@outlook.com>
Date: Sun, 9 May 2021 02:42:43 +0800
Subject: [PATCH 1/2] Check the ABI of `body.source`
---
.../rustc_mir/src/interpret/terminator.rs | 26 +++++++++++--------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/compiler/rustc_mir/src/interpret/terminator.rs b/compiler/rustc_mir/src/interpret/terminator.rs
index 4aa1360d53539..d287bc858ed5b 100644
--- a/compiler/rustc_mir/src/interpret/terminator.rs
+++ b/compiler/rustc_mir/src/interpret/terminator.rs
@@ -3,7 +3,10 @@ use std::convert::TryFrom;
use rustc_middle::ty::layout::TyAndLayout;
use rustc_middle::ty::Instance;
-use rustc_middle::{mir, ty};
+use rustc_middle::{
+ mir,
+ ty::{self, Ty},
+};
use rustc_target::abi::{self, LayoutOf as _};
use rustc_target::spec::abi::Abi;
@@ -228,15 +231,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
};
// ABI check
- {
- let callee_abi = {
- let instance_ty = instance.ty(*self.tcx, self.param_env);
- match instance_ty.kind() {
- ty::FnDef(..) => instance_ty.fn_sig(*self.tcx).abi(),
- ty::Closure(..) => Abi::RustCall,
- ty::Generator(..) => Abi::Rust,
- _ => span_bug!(self.cur_span(), "unexpected callee ty: {:?}", instance_ty),
- }
+ let check_abi = |this: &Self, instance_ty: Ty<'tcx>| -> InterpResult<'tcx> {
+ let callee_abi = match instance_ty.kind() {
+ ty::FnDef(..) => instance_ty.fn_sig(*this.tcx).abi(),
+ ty::Closure(..) => Abi::RustCall,
+ ty::Generator(..) => Abi::Rust,
+ _ => span_bug!(this.cur_span(), "unexpected callee ty: {:?}", instance_ty),
};
let normalize_abi = |abi| match abi {
Abi::Rust | Abi::RustCall | Abi::RustIntrinsic | Abi::PlatformIntrinsic =>
@@ -253,10 +253,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
caller_abi.name()
)
}
- }
+ Ok(())
+ };
match instance.def {
ty::InstanceDef::Intrinsic(..) => {
+ check_abi(self, instance.ty(*self.tcx, self.param_env))?;
assert!(caller_abi == Abi::RustIntrinsic || caller_abi == Abi::PlatformIntrinsic);
M::call_intrinsic(self, instance, args, ret, unwind)
}
@@ -274,6 +276,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
None => return Ok(()),
};
+ check_abi(self, self.tcx.type_of(body.source.def_id()))?;
+
self.push_stack_frame(
instance,
body,
From 97bc0eefe7566955eedff5fb587807224b2387c3 Mon Sep 17 00:00:00 2001
From: hyd-dev <yd-huang@outlook.com>
Date: Mon, 17 May 2021 20:54:31 +0800
Subject: [PATCH 2/2] Add a comment for `check_abi()`
---
compiler/rustc_mir/src/interpret/terminator.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/compiler/rustc_mir/src/interpret/terminator.rs b/compiler/rustc_mir/src/interpret/terminator.rs
index d287bc858ed5b..a7fcb41f74a99 100644
--- a/compiler/rustc_mir/src/interpret/terminator.rs
+++ b/compiler/rustc_mir/src/interpret/terminator.rs
@@ -276,6 +276,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
None => return Ok(()),
};
+ // Check against the ABI of the MIR body we are calling (not the ABI of `instance`;
+ // these can differ when `find_mir_or_eval_fn` does something clever like resolve
+ // exported symbol names).
check_abi(self, self.tcx.type_of(body.source.def_id()))?;
self.push_stack_frame(