From ec40e3a5da0cb96d18f9ee6e0ab11c17a9ae23c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Rakic?= <remy.rakic+github@gmail.com>
Date: Sat, 6 Mar 2021 01:42:41 +0100
Subject: [PATCH] convert `_mm_mask_i64gather_epi64` to const generics

---
 .../stdarch/crates/core_arch/src/x86/avx2.rs   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/library/stdarch/crates/core_arch/src/x86/avx2.rs b/library/stdarch/crates/core_arch/src/x86/avx2.rs
index e35670b9cdcb..a97235374607 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx2.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx2.rs
@@ -1658,26 +1658,21 @@ pub unsafe fn _mm_i64gather_epi64<const SCALE: i32>(
 /// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mask_i64gather_epi64)
 #[inline]
 #[target_feature(enable = "avx2")]
-#[cfg_attr(test, assert_instr(vpgatherqq, scale = 1))]
-#[rustc_args_required_const(4)]
+#[cfg_attr(test, assert_instr(vpgatherqq, SCALE = 1))]
+#[rustc_legacy_const_generics(4)]
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub unsafe fn _mm_mask_i64gather_epi64(
+pub unsafe fn _mm_mask_i64gather_epi64<const SCALE: i32>(
     src: __m128i,
     slice: *const i64,
     offsets: __m128i,
     mask: __m128i,
-    scale: i32,
 ) -> __m128i {
+    static_assert_imm8_scale!(SCALE);
     let src = src.as_i64x2();
     let mask = mask.as_i64x2();
     let offsets = offsets.as_i64x2();
     let slice = slice as *const i8;
-    macro_rules! call {
-        ($imm8:expr) => {
-            pgatherqq(src, slice, offsets, mask, $imm8)
-        };
-    }
-    let r = constify_imm8_gather!(scale, call);
+    let r = pgatherqq(src, slice, offsets, mask, SCALE as i8);
     transmute(r)
 }
 
@@ -5849,12 +5844,11 @@ mod tests {
             arr[i as usize] = i;
         }
         // A multiplier of 8 is word-addressing for i64s
-        let r = _mm_mask_i64gather_epi64(
+        let r = _mm_mask_i64gather_epi64::<8>(
             _mm_set1_epi64x(256),
             arr.as_ptr(),
             _mm_setr_epi64x(16, 16),
             _mm_setr_epi64x(-1, 0),
-            8,
         );
         assert_eq_m128i(r, _mm_setr_epi64x(16, 256));
     }