From bf8b15f5533c852e69ba9051c96bbcac862bdfbb Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Tue, 13 Apr 2021 04:32:11 +0100 Subject: [PATCH] Bump stdarch submodule --- library/stdarch | 2 +- src/test/ui/consts/const_arg_local.rs | 12 +++++------- src/test/ui/consts/const_arg_local.stderr | 8 ++++---- src/test/ui/consts/const_arg_promotable.rs | 12 +++++------- src/test/ui/consts/const_arg_promotable.stderr | 8 ++++---- src/test/ui/consts/const_arg_wrapper.rs | 12 +++++------- src/test/ui/consts/const_arg_wrapper.stderr | 8 ++++---- 7 files changed, 28 insertions(+), 34 deletions(-) diff --git a/library/stdarch b/library/stdarch index 19f5459dd0f89..6c4f4e1990b76 160000 --- a/library/stdarch +++ b/library/stdarch @@ -1 +1 @@ -Subproject commit 19f5459dd0f89e466b7bcaa0f69ecca90f21a4d1 +Subproject commit 6c4f4e1990b76be8a07bde1956d2e3452fd55ee4 diff --git a/src/test/ui/consts/const_arg_local.rs b/src/test/ui/consts/const_arg_local.rs index 0da4b44a96839..9add1f8d5a359 100644 --- a/src/test/ui/consts/const_arg_local.rs +++ b/src/test/ui/consts/const_arg_local.rs @@ -1,13 +1,11 @@ -// only-x86_64 +#![feature(rustc_attrs)] -#[cfg(target_arch = "x86")] -use std::arch::x86::*; -#[cfg(target_arch = "x86_64")] -use std::arch::x86_64::*; +#[rustc_args_required_const(0)] +fn foo(_imm8: i32) {} -unsafe fn pclmul(a: __m128i, b: __m128i) -> __m128i { +fn bar() { let imm8 = 3; - _mm_clmulepi64_si128(a, b, imm8) //~ ERROR argument 3 is required to be a constant + foo(imm8) //~ ERROR argument 1 is required to be a constant } fn main() {} diff --git a/src/test/ui/consts/const_arg_local.stderr b/src/test/ui/consts/const_arg_local.stderr index 197b2f082e5a0..bad85471a6b37 100644 --- a/src/test/ui/consts/const_arg_local.stderr +++ b/src/test/ui/consts/const_arg_local.stderr @@ -1,8 +1,8 @@ -error: argument 3 is required to be a constant - --> $DIR/const_arg_local.rs:10:5 +error: argument 1 is required to be a constant + --> $DIR/const_arg_local.rs:8:5 | -LL | _mm_clmulepi64_si128(a, b, imm8) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | foo(imm8) + | ^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/consts/const_arg_promotable.rs b/src/test/ui/consts/const_arg_promotable.rs index 25f45104d6aa1..cea3817550eb2 100644 --- a/src/test/ui/consts/const_arg_promotable.rs +++ b/src/test/ui/consts/const_arg_promotable.rs @@ -1,12 +1,10 @@ -// only-x86_64 +#![feature(rustc_attrs)] -#[cfg(target_arch = "x86")] -use std::arch::x86::*; -#[cfg(target_arch = "x86_64")] -use std::arch::x86_64::*; +#[rustc_args_required_const(0)] +fn foo(_imm8: i32) {} -unsafe fn pclmul(a: __m128i, b: __m128i) -> __m128i { - _mm_clmulepi64_si128(a, b, *&mut 42) //~ ERROR argument 3 is required to be a constant +fn bar() { + foo(*&mut 42) //~ ERROR argument 1 is required to be a constant } fn main() {} diff --git a/src/test/ui/consts/const_arg_promotable.stderr b/src/test/ui/consts/const_arg_promotable.stderr index 5de3ee6654ad9..b24b245b3ce0c 100644 --- a/src/test/ui/consts/const_arg_promotable.stderr +++ b/src/test/ui/consts/const_arg_promotable.stderr @@ -1,8 +1,8 @@ -error: argument 3 is required to be a constant - --> $DIR/const_arg_promotable.rs:9:5 +error: argument 1 is required to be a constant + --> $DIR/const_arg_promotable.rs:7:5 | -LL | _mm_clmulepi64_si128(a, b, *&mut 42) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | foo(*&mut 42) + | ^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/consts/const_arg_wrapper.rs b/src/test/ui/consts/const_arg_wrapper.rs index 92ff264cd2b8e..3dd3a2ffaf3cb 100644 --- a/src/test/ui/consts/const_arg_wrapper.rs +++ b/src/test/ui/consts/const_arg_wrapper.rs @@ -1,12 +1,10 @@ -// only-x86_64 +#![feature(rustc_attrs)] -#[cfg(target_arch = "x86")] -use std::arch::x86::*; -#[cfg(target_arch = "x86_64")] -use std::arch::x86_64::*; +#[rustc_args_required_const(0)] +fn foo(_imm8: i32) {} -unsafe fn pclmul(a: __m128i, b: __m128i, imm8: i32) -> __m128i { - _mm_clmulepi64_si128(a, b, imm8) //~ ERROR argument 3 is required to be a constant +fn bar(imm8: i32) { + foo(imm8) //~ ERROR argument 1 is required to be a constant } fn main() {} diff --git a/src/test/ui/consts/const_arg_wrapper.stderr b/src/test/ui/consts/const_arg_wrapper.stderr index 4acf2f0f4d1e5..9cd95a2020fcd 100644 --- a/src/test/ui/consts/const_arg_wrapper.stderr +++ b/src/test/ui/consts/const_arg_wrapper.stderr @@ -1,8 +1,8 @@ -error: argument 3 is required to be a constant - --> $DIR/const_arg_wrapper.rs:9:5 +error: argument 1 is required to be a constant + --> $DIR/const_arg_wrapper.rs:7:5 | -LL | _mm_clmulepi64_si128(a, b, imm8) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | foo(imm8) + | ^^^^^^^^^ error: aborting due to previous error