@@ -3,7 +3,7 @@ use std::time::Duration;
3
3
use std:: { cmp, iter} ;
4
4
5
5
use rand:: RngCore ;
6
- use rustc_abi:: { Align , ExternAbi , FieldIdx , FieldsShape , Size , Variants } ;
6
+ use rustc_abi:: { Align , CanonAbi , ExternAbi , FieldIdx , FieldsShape , Size , Variants } ;
7
7
use rustc_apfloat:: Float ;
8
8
use rustc_apfloat:: ieee:: { Double , Half , Quad , Single } ;
9
9
use rustc_hir:: Safety ;
@@ -18,7 +18,7 @@ use rustc_middle::ty::{self, Binder, FloatTy, FnSig, IntTy, Ty, TyCtxt, UintTy};
18
18
use rustc_session:: config:: CrateType ;
19
19
use rustc_span:: { Span , Symbol } ;
20
20
use rustc_symbol_mangling:: mangle_internal_symbol;
21
- use rustc_target:: callconv:: { Conv , FnAbi } ;
21
+ use rustc_target:: callconv:: FnAbi ;
22
22
23
23
use crate :: * ;
24
24
@@ -936,11 +936,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
936
936
fn check_callconv < ' a > (
937
937
& self ,
938
938
fn_abi : & FnAbi < ' tcx , Ty < ' tcx > > ,
939
- exp_abi : Conv ,
939
+ exp_abi : CanonAbi ,
940
940
) -> InterpResult < ' a , ( ) > {
941
941
if fn_abi. conv != exp_abi {
942
942
throw_ub_format ! (
943
- "calling a function with calling convention {exp_abi} using caller calling convention {}" ,
943
+ r# "calling a function with calling convention " {exp_abi}" using caller calling convention " {}""# ,
944
944
fn_abi. conv
945
945
) ;
946
946
}
@@ -973,7 +973,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
973
973
fn check_abi_and_shim_symbol_clash (
974
974
& mut self ,
975
975
abi : & FnAbi < ' tcx , Ty < ' tcx > > ,
976
- exp_abi : Conv ,
976
+ exp_abi : CanonAbi ,
977
977
link_name : Symbol ,
978
978
) -> InterpResult < ' tcx , ( ) > {
979
979
self . check_callconv ( abi, exp_abi) ?;
@@ -998,7 +998,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
998
998
fn check_shim < ' a , const N : usize > (
999
999
& mut self ,
1000
1000
abi : & FnAbi < ' tcx , Ty < ' tcx > > ,
1001
- exp_abi : Conv ,
1001
+ exp_abi : CanonAbi ,
1002
1002
link_name : Symbol ,
1003
1003
args : & ' a [ OpTy < ' tcx > ] ,
1004
1004
) -> InterpResult < ' tcx , & ' a [ OpTy < ' tcx > ; N ] > {
@@ -1098,7 +1098,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1098
1098
fn check_shim_variadic < ' a , const N : usize > (
1099
1099
& mut self ,
1100
1100
abi : & FnAbi < ' tcx , Ty < ' tcx > > ,
1101
- exp_abi : Conv ,
1101
+ exp_abi : CanonAbi ,
1102
1102
link_name : Symbol ,
1103
1103
args : & ' a [ OpTy < ' tcx > ] ,
1104
1104
) -> InterpResult < ' tcx , ( & ' a [ OpTy < ' tcx > ; N ] , & ' a [ OpTy < ' tcx > ] ) >
0 commit comments