Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 15:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #62674 - RalfJung:miri-abi, r=eddyb

Browse Source 
RustIntrinsic and PlatformIntrinsic are also the same ABI as Rust

r? @eddyb
This commit is contained in:
bors
2019-07-15 05:40:41 +00:00
parent e452e2929d 6c293d8101
commit 9bb855cda0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc_mir/interpret/terminator.rs
+7 -2
View File
@@ -280,8 +280,13 @@ fn eval_fn_call(
_ => bug!("unexpected callee ty: {:?}", instance_ty),
}
};
// Rust and RustCall are compatible
let normalize_abi = |abi| if abi == Abi::RustCall { Abi::Rust } else { abi };
let normalize_abi = |abi| match abi {
Abi::Rust | Abi::RustCall | Abi::RustIntrinsic | Abi::PlatformIntrinsic =>
// These are all the same ABI, really.
Abi::Rust,
abi =>
abi,
};
if normalize_abi(caller_abi) != normalize_abi(callee_abi) {
return err!(FunctionAbiMismatch(caller_abi, callee_abi));
}