Replace associated const hacks with inline consts

Fixes #1368

Author: Amanieu

crates/core_arch/src/aarch64/armclang.rs

@@ -18,6 +18,6 @@ use stdarch_test::assert_instr;
 #[inline(always)]
 #[rustc_legacy_const_generics(0)]
 pub unsafe fn __breakpoint<const VAL: i32>() {
-    static_assert_imm16!(VAL);
+    static_assert_uimm_bits!(VAL, 16);
     crate::arch::asm!("brk {}", const VAL);
 }

crates/core_arch/src/aarch64/neon/generated.rs

@@ -67,7 +67,7 @@ pub const _PREFETCH_LOCALITY3: i32 = 3;
 // FIXME: Replace this with the standard ACLE __pld/__pldx/__pli/__plix intrinsics
 pub unsafe fn _prefetch<const RW: i32, const LOCALITY: i32>(p: *const i8) {
     // We use the `llvm.prefetch` intrinsic with `cache type` = 1 (data cache).
-    static_assert_imm1!(RW);
-    static_assert_imm2!(LOCALITY);
+    static_assert_uimm_bits!(RW, 1);
+    static_assert_uimm_bits!(LOCALITY, 2);
     prefetch(p, RW, LOCALITY, 1);
 }

crates/core_arch/src/aarch64/neon/mod.rs

@@ -96,7 +96,7 @@ pub unsafe fn __tcommit() {
 #[cfg_attr(test, assert_instr(tcancel, IMM16 = 0x0))]
 #[rustc_legacy_const_generics(0)]
 pub unsafe fn __tcancel<const IMM16: u64>() {
-    static_assert!(IMM16: u64 where IMM16 <= 65535);
+    static_assert!(IMM16 <= 65535);
     aarch64_tcancel(IMM16);
 }
 

crates/core_arch/src/aarch64/prefetch.rs

@@ -30,6 +30,6 @@ use stdarch_test::assert_instr;
 #[inline(always)]
 #[rustc_legacy_const_generics(0)]
 pub unsafe fn __breakpoint<const VAL: i32>() {
-    static_assert_imm8!(VAL);
+    static_assert_uimm_bits!(VAL, 8);
     crate::arch::asm!("bkpt #{}", const VAL);
 }

crates/core_arch/src/aarch64/tme.rs

@@ -103,7 +103,7 @@ pub unsafe fn udf() -> ! {
 #[inline(always)]
 #[rustc_legacy_const_generics(0)]
 pub unsafe fn __dbg<const IMM4: i32>() {
-    static_assert_imm4!(IMM4);
+    static_assert_uimm_bits!(IMM4, 4);
     dbg(IMM4);
 }