@@ -1251,8 +1251,8 @@ fn generic_simd_intrinsic(
1251
1251
1252
1252
fn simd_simple_float_intrinsic (
1253
1253
name : & str ,
1254
- in_elem : & :: rustc:: ty:: TyS ,
1255
- in_ty : & :: rustc:: ty:: TyS ,
1254
+ in_elem : & :: rustc:: ty:: TyS < ' _ > ,
1255
+ in_ty : & :: rustc:: ty:: TyS < ' _ > ,
1256
1256
in_len : usize ,
1257
1257
bx : & mut Builder < ' a , ' ll , ' tcx > ,
1258
1258
span : Span ,
@@ -1362,7 +1362,7 @@ fn generic_simd_intrinsic(
1362
1362
// FIXME: use:
1363
1363
// https://github.com/llvm-mirror/llvm/blob/master/include/llvm/IR/Function.h#L182
1364
1364
// https://github.com/llvm-mirror/llvm/blob/master/include/llvm/IR/Intrinsics.h#L81
1365
- fn llvm_vector_str ( elem_ty : ty:: Ty , vec_len : usize , no_pointers : usize ) -> String {
1365
+ fn llvm_vector_str ( elem_ty : ty:: Ty < ' _ > , vec_len : usize , no_pointers : usize ) -> String {
1366
1366
let p0s: String = "p0" . repeat ( no_pointers) ;
1367
1367
match elem_ty. sty {
1368
1368
ty:: Int ( v) => format ! ( "v{}{}i{}" , vec_len, p0s, v. bit_width( ) . unwrap( ) ) ,
@@ -1372,7 +1372,7 @@ fn generic_simd_intrinsic(
1372
1372
}
1373
1373
}
1374
1374
1375
- fn llvm_vector_ty ( cx : & CodegenCx < ' ll , ' _ > , elem_ty : ty:: Ty , vec_len : usize ,
1375
+ fn llvm_vector_ty ( cx : & CodegenCx < ' ll , ' _ > , elem_ty : ty:: Ty < ' _ > , vec_len : usize ,
1376
1376
mut no_pointers : usize ) -> & ' ll Type {
1377
1377
// FIXME: use cx.layout_of(ty).llvm_type() ?
1378
1378
let mut elem_ty = match elem_ty. sty {
@@ -1418,15 +1418,15 @@ fn generic_simd_intrinsic(
1418
1418
in_ty, ret_ty) ;
1419
1419
1420
1420
// This counts how many pointers
1421
- fn ptr_count ( t : ty:: Ty ) -> usize {
1421
+ fn ptr_count ( t : ty:: Ty < ' _ > ) -> usize {
1422
1422
match t. sty {
1423
1423
ty:: RawPtr ( p) => 1 + ptr_count ( p. ty ) ,
1424
1424
_ => 0 ,
1425
1425
}
1426
1426
}
1427
1427
1428
1428
// Non-ptr type
1429
- fn non_ptr ( t : ty:: Ty ) -> ty:: Ty {
1429
+ fn non_ptr ( t : ty:: Ty < ' _ > ) -> ty:: Ty < ' _ > {
1430
1430
match t. sty {
1431
1431
ty:: RawPtr ( p) => non_ptr ( p. ty ) ,
1432
1432
_ => t,
@@ -1517,15 +1517,15 @@ fn generic_simd_intrinsic(
1517
1517
arg_tys[ 2 ] . simd_size( tcx) ) ;
1518
1518
1519
1519
// This counts how many pointers
1520
- fn ptr_count ( t : ty:: Ty ) -> usize {
1520
+ fn ptr_count ( t : ty:: Ty < ' _ > ) -> usize {
1521
1521
match t. sty {
1522
1522
ty:: RawPtr ( p) => 1 + ptr_count ( p. ty ) ,
1523
1523
_ => 0 ,
1524
1524
}
1525
1525
}
1526
1526
1527
1527
// Non-ptr type
1528
- fn non_ptr ( t : ty:: Ty ) -> ty:: Ty {
1528
+ fn non_ptr ( t : ty:: Ty < ' _ > ) -> ty:: Ty < ' _ > {
1529
1529
match t. sty {
1530
1530
ty:: RawPtr ( p) => non_ptr ( p. ty ) ,
1531
1531
_ => t,
@@ -1901,7 +1901,7 @@ unsupported {} from `{}` with element `{}` of size `{}` to `{}`"#,
1901
1901
// Returns None if the type is not an integer
1902
1902
// FIXME: there’s multiple of this functions, investigate using some of the already existing
1903
1903
// stuffs.
1904
- fn int_type_width_signed ( ty : Ty , cx : & CodegenCx ) -> Option < ( u64 , bool ) > {
1904
+ fn int_type_width_signed ( ty : Ty < ' _ > , cx : & CodegenCx < ' _ , ' _ > ) -> Option < ( u64 , bool ) > {
1905
1905
match ty. sty {
1906
1906
ty:: Int ( t) => Some ( ( match t {
1907
1907
ast:: IntTy :: Isize => cx. tcx . sess . target . isize_ty . bit_width ( ) . unwrap ( ) as u64 ,
0 commit comments