diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs index 395596eb0623..012829822060 100644 --- a/src/intrinsics/mod.rs +++ b/src/intrinsics/mod.rs @@ -267,10 +267,10 @@ macro simd_cmp { } macro simd_int_binop { - ($fx:expr, $intrinsic:expr, $op:ident($x:ident, $y:ident) -> $ret:ident) => { - simd_int_binop!($fx, $intrinsic, $op|$op($x, $y) -> $ret); + ($fx:expr, $op:ident($x:ident, $y:ident) -> $ret:ident) => { + simd_int_binop!($fx, $op|$op($x, $y) -> $ret); }, - ($fx:expr, $intrinsic:expr, $op_u:ident|$op_s:ident($x:ident, $y:ident) -> $ret:ident) => { + ($fx:expr, $op_u:ident|$op_s:ident($x:ident, $y:ident) -> $ret:ident) => { let (lane_layout, lane_count) = lane_type_and_count($fx.tcx, $x.layout()); let x_val = $x.load_vector($fx); let y_val = $y.load_vector($fx); @@ -285,10 +285,10 @@ macro simd_int_binop { } macro simd_int_flt_binop { - ($fx:expr, $intrinsic:expr, $op:ident|$op_f:ident($x:ident, $y:ident) -> $ret:ident) => { - simd_int_flt_binop!($fx, $intrinsic, $op|$op|$op_f($x, $y) -> $ret); + ($fx:expr, $op:ident|$op_f:ident($x:ident, $y:ident) -> $ret:ident) => { + simd_int_flt_binop!($fx, $op|$op|$op_f($x, $y) -> $ret); }, - ($fx:expr, $intrinsic:expr, $op_u:ident|$op_s:ident|$op_f:ident($x:ident, $y:ident) -> $ret:ident) => { + ($fx:expr, $op_u:ident|$op_s:ident|$op_f:ident($x:ident, $y:ident) -> $ret:ident) => { let (lane_layout, lane_count) = lane_type_and_count($fx.tcx, $x.layout()); let x_val = $x.load_vector($fx); let y_val = $y.load_vector($fx); @@ -303,7 +303,7 @@ macro simd_int_flt_binop { }, } -macro simd_flt_binop($fx:expr, $intrinsic:expr, $op:ident($x:ident, $y:ident) -> $ret:ident) { +macro simd_flt_binop($fx:expr, $op:ident($x:ident, $y:ident) -> $ret:ident) { let (lane_layout, lane_count) = lane_type_and_count($fx.tcx, $x.layout()); let x_val = $x.load_vector($fx); let y_val = $y.load_vector($fx); diff --git a/src/intrinsics/simd.rs b/src/intrinsics/simd.rs index 1dbe1f33c863..1870192e2241 100644 --- a/src/intrinsics/simd.rs +++ b/src/intrinsics/simd.rs @@ -127,38 +127,38 @@ pub fn codegen_simd_intrinsic_call<'tcx>( }; simd_add, (c x, c y) { - simd_int_flt_binop!(fx, intrinsic, iadd|fadd(x, y) -> ret); + simd_int_flt_binop!(fx, iadd|fadd(x, y) -> ret); }; simd_sub, (c x, c y) { - simd_int_flt_binop!(fx, intrinsic, isub|fsub(x, y) -> ret); + simd_int_flt_binop!(fx, isub|fsub(x, y) -> ret); }; simd_mul, (c x, c y) { - simd_int_flt_binop!(fx, intrinsic, imul|fmul(x, y) -> ret); + simd_int_flt_binop!(fx, imul|fmul(x, y) -> ret); }; simd_div, (c x, c y) { - simd_int_flt_binop!(fx, intrinsic, udiv|sdiv|fdiv(x, y) -> ret); + simd_int_flt_binop!(fx, udiv|sdiv|fdiv(x, y) -> ret); }; simd_shl, (c x, c y) { - simd_int_binop!(fx, intrinsic, ishl(x, y) -> ret); + simd_int_binop!(fx, ishl(x, y) -> ret); }; simd_shr, (c x, c y) { - simd_int_binop!(fx, intrinsic, ushr|sshr(x, y) -> ret); + simd_int_binop!(fx, ushr|sshr(x, y) -> ret); }; simd_and, (c x, c y) { - simd_int_binop!(fx, intrinsic, band(x, y) -> ret); + simd_int_binop!(fx, band(x, y) -> ret); }; simd_or, (c x, c y) { - simd_int_binop!(fx, intrinsic, bor(x, y) -> ret); + simd_int_binop!(fx, bor(x, y) -> ret); }; simd_xor, (c x, c y) { - simd_int_binop!(fx, intrinsic, bxor(x, y) -> ret); + simd_int_binop!(fx, bxor(x, y) -> ret); }; simd_fmin, (c x, c y) { - simd_flt_binop!(fx, intrinsic, fmin(x, y) -> ret); + simd_flt_binop!(fx, fmin(x, y) -> ret); }; simd_fmax, (c x, c y) { - simd_flt_binop!(fx, intrinsic, fmax(x, y) -> ret); + simd_flt_binop!(fx, fmax(x, y) -> ret); }; } }