6
6
7
7
use crate :: abi:: call:: { ArgAbi , ArgExtension , CastTarget , FnAbi , PassMode , Reg , RegKind , Uniform } ;
8
8
use crate :: abi:: {
9
- self , Abi , FieldsShape , HasDataLayout , LayoutOf , Size , TyAndLayout , TyAndLayoutMethods ,
9
+ self , Abi , FieldsShape , HasDataLayout , LayoutOf , Size , TyAbiInterface , TyAndLayout ,
10
10
} ;
11
11
use crate :: spec:: HasTargetSpec ;
12
12
@@ -43,7 +43,7 @@ fn should_use_fp_conv_helper<'a, Ty, C>(
43
43
field2_kind : & mut RegPassKind ,
44
44
) -> Result < ( ) , CannotUseFpConv >
45
45
where
46
- Ty : TyAndLayoutMethods < ' a , C > + Copy ,
46
+ Ty : TyAbiInterface < ' a , C > + Copy ,
47
47
C : LayoutOf < ' a , Ty = Ty , TyAndLayout = TyAndLayout < ' a , Ty > > ,
48
48
{
49
49
match arg_layout. abi {
@@ -130,7 +130,7 @@ fn should_use_fp_conv<'a, Ty, C>(
130
130
flen : u64 ,
131
131
) -> Option < FloatConv >
132
132
where
133
- Ty : TyAndLayoutMethods < ' a , C > + Copy ,
133
+ Ty : TyAbiInterface < ' a , C > + Copy ,
134
134
C : LayoutOf < ' a , Ty = Ty , TyAndLayout = TyAndLayout < ' a , Ty > > ,
135
135
{
136
136
let mut field1_kind = RegPassKind :: Unknown ;
@@ -149,7 +149,7 @@ where
149
149
150
150
fn classify_ret < ' a , Ty , C > ( cx : & C , arg : & mut ArgAbi < ' a , Ty > , xlen : u64 , flen : u64 ) -> bool
151
151
where
152
- Ty : TyAndLayoutMethods < ' a , C > + Copy ,
152
+ Ty : TyAbiInterface < ' a , C > + Copy ,
153
153
C : LayoutOf < ' a , Ty = Ty , TyAndLayout = TyAndLayout < ' a , Ty > > ,
154
154
{
155
155
if let Some ( conv) = should_use_fp_conv ( cx, & arg. layout , xlen, flen) {
@@ -212,7 +212,7 @@ fn classify_arg<'a, Ty, C>(
212
212
avail_gprs : & mut u64 ,
213
213
avail_fprs : & mut u64 ,
214
214
) where
215
- Ty : TyAndLayoutMethods < ' a , C > + Copy ,
215
+ Ty : TyAbiInterface < ' a , C > + Copy ,
216
216
C : LayoutOf < ' a , Ty = Ty , TyAndLayout = TyAndLayout < ' a , Ty > > ,
217
217
{
218
218
if !is_vararg {
@@ -320,7 +320,7 @@ fn extend_integer_width<'a, Ty>(arg: &mut ArgAbi<'a, Ty>, xlen: u64) {
320
320
321
321
pub fn compute_abi_info < ' a , Ty , C > ( cx : & C , fn_abi : & mut FnAbi < ' a , Ty > )
322
322
where
323
- Ty : TyAndLayoutMethods < ' a , C > + Copy ,
323
+ Ty : TyAbiInterface < ' a , C > + Copy ,
324
324
C : LayoutOf < ' a , Ty = Ty , TyAndLayout = TyAndLayout < ' a , Ty > > + HasDataLayout + HasTargetSpec ,
325
325
{
326
326
let flen = match & cx. target_spec ( ) . llvm_abiname [ ..] {
0 commit comments