Skip to content

Commit 62ba85b

Browse files
committed
Rebase cleanup: is_simd lost its parameter.
1 parent 4b24249 commit 62ba85b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/librustc_trans/trans/intrinsic.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,10 +1358,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
13581358

13591359
if let Some(cmp_op) = comparison {
13601360
assert_eq!(arg_tys.len(), 2);
1361-
require!(arg_tys[0].is_simd(tcx),
1361+
require!(arg_tys[0].is_simd(),
13621362
"SIMD comparison intrinsic monomorphized for non-SIMD argument type `{}`",
13631363
arg_tys[0]);
1364-
require!(ret_ty.is_simd(tcx),
1364+
require!(ret_ty.is_simd(),
13651365
"SIMD comparison intrinsic monomorphized for non-SIMD return type `{}`",
13661366
ret_ty);
13671367

@@ -1393,10 +1393,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
13931393
"bad `simd_shuffle` instruction only caught in trans?")
13941394
};
13951395

1396-
require!(arg_tys[0].is_simd(tcx),
1396+
require!(arg_tys[0].is_simd(),
13971397
"SIMD shuffle intrinsic monomorphized with non-SIMD input type `{}`",
13981398
arg_tys[0]);
1399-
require!(ret_ty.is_simd(tcx),
1399+
require!(ret_ty.is_simd(),
14001400
"SIMD shuffle intrinsic monomorphized for non-SIMD return type `{}`",
14011401
ret_ty);
14021402

@@ -1451,7 +1451,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
14511451
}
14521452

14531453
if name == "simd_insert" {
1454-
require!(arg_tys[0].is_simd(tcx),
1454+
require!(arg_tys[0].is_simd(),
14551455
"SIMD insert intrinsic monomorphized for non-SIMD input type");
14561456

14571457
let elem_ty = arg_tys[0].simd_type(tcx);
@@ -1460,7 +1460,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
14601460
return InsertElement(bcx, llargs[0], llargs[2], llargs[1])
14611461
}
14621462
if name == "simd_extract" {
1463-
require!(arg_tys[0].is_simd(tcx),
1463+
require!(arg_tys[0].is_simd(),
14641464
"SIMD insert intrinsic monomorphized for non-SIMD input type");
14651465

14661466
let elem_ty = arg_tys[0].simd_type(tcx);
@@ -1470,10 +1470,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
14701470
}
14711471

14721472
if name == "simd_cast" {
1473-
require!(arg_tys[0].is_simd(tcx),
1473+
require!(arg_tys[0].is_simd(),
14741474
"SIMD cast intrinsic monomorphized with non-SIMD input type `{}`",
14751475
arg_tys[0]);
1476-
require!(ret_ty.is_simd(tcx),
1476+
require!(ret_ty.is_simd(),
14771477
"SIMD cast intrinsic monomorphized with non-SIMD return type `{}`",
14781478
ret_ty);
14791479
require!(arg_tys[0].simd_size(tcx) == ret_ty.simd_size(tcx),
@@ -1614,7 +1614,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
16141614
($($name: ident: $($($p: ident),* => $call: expr),*;)*) => {
16151615
$(
16161616
if name == stringify!($name) {
1617-
require!(arg_tys[0].is_simd(tcx),
1617+
require!(arg_tys[0].is_simd(),
16181618
"`{}` intrinsic monomorphized with non-SIMD type `{}`",
16191619
name, arg_tys[0]);
16201620
let in_ = arg_tys[0].simd_type(tcx);

src/librustc_typeck/check/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ fn match_intrinsic_type_to_type<'tcx, 'a>(
481481
},
482482
Pointer(_) => unimplemented!(),
483483
Vector(ref inner_expected, len) => {
484-
if !t.is_simd(tcx) {
484+
if !t.is_simd() {
485485
simple_error(&format!("non-simd type `{}`", t),
486486
"simd type");
487487
return;

0 commit comments

Comments
 (0)