diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2021-11-03 16:10:09 +0000 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2021-11-07 03:44:42 +0000 |
| commit | 87d0d64b7869c9cb0be7cad957b2b3939ed15fdc (patch) | |
| tree | 955dc682c84c40a93ccfad2acf567d271a4fe25c | |
| parent | eb32c00216efb74d2101c9c7896f0b5c5c45fdb0 (diff) | |
Restrict tests that use needs-asm-support to non-experimental
architectures
| -rw-r--r-- | src/test/ui/asm/issue-89305.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/asm/issue-89305.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/consts/inline_asm.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/inline_asm.stderr | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 6 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/test/ui/asm/issue-89305.rs b/src/test/ui/asm/issue-89305.rs index bdcf3f305eb..a4b22e21028 100644 --- a/src/test/ui/asm/issue-89305.rs +++ b/src/test/ui/asm/issue-89305.rs @@ -2,6 +2,7 @@ // as both unused and possibly-uninitialized. // check-pass +// needs-asm-support #![feature(asm)] #![warn(unused)] diff --git a/src/test/ui/asm/issue-89305.stderr b/src/test/ui/asm/issue-89305.stderr index 9cc127b44d0..3fb1526183b 100644 --- a/src/test/ui/asm/issue-89305.stderr +++ b/src/test/ui/asm/issue-89305.stderr @@ -1,11 +1,11 @@ warning: unused variable: `x` - --> $DIR/issue-89305.rs:11:13 + --> $DIR/issue-89305.rs:12:13 | LL | let x: () = asm!("nop"); | ^ help: if this is intentional, prefix it with an underscore: `_x` | note: the lint level is defined here - --> $DIR/issue-89305.rs:7:9 + --> $DIR/issue-89305.rs:8:9 | LL | #![warn(unused)] | ^^^^^^ diff --git a/src/test/ui/consts/inline_asm.rs b/src/test/ui/consts/inline_asm.rs index fa9542f93a3..b46ca6ba6df 100644 --- a/src/test/ui/consts/inline_asm.rs +++ b/src/test/ui/consts/inline_asm.rs @@ -1,3 +1,5 @@ +// needs-asm-support + #![feature(asm)] const _: () = unsafe { asm!("nop") }; diff --git a/src/test/ui/consts/inline_asm.stderr b/src/test/ui/consts/inline_asm.stderr index f38044a290b..65a828d118c 100644 --- a/src/test/ui/consts/inline_asm.stderr +++ b/src/test/ui/consts/inline_asm.stderr @@ -1,5 +1,5 @@ error[E0015]: inline assembly is not allowed in constants - --> $DIR/inline_asm.rs:3:24 + --> $DIR/inline_asm.rs:5:24 | LL | const _: () = unsafe { asm!("nop") }; | ^^^^^^^^^^^ diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index d03c21dc508..6ca145a58e9 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -133,8 +133,10 @@ const BIG_ENDIAN: &[&str] = &[ ]; static ASM_SUPPORTED_ARCHS: &[&str] = &[ - "x86", "x86_64", "arm", "aarch64", "riscv32", "riscv64", "nvptx64", "hexagon", "mips", - "mips64", "spirv", "wasm32", + "x86", "x86_64", "arm", "aarch64", "riscv32", + "riscv64", + // These targets require an additional asm_experimental_arch feature. + // "nvptx64", "hexagon", "mips", "mips64", "spirv", "wasm32", ]; pub fn has_asm_support(triple: &str) -> bool { |