From 35fd99c7790d7310fd3c2ddabe02bd7a33a45e55 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 17 Aug 2021 18:43:09 -0700 Subject: [PATCH] Add needs-asm-support to more tests These were found as test failures on s390x for RHEL and Fedora. --- src/test/codegen/naked-noinline.rs | 1 + src/test/ui/feature-gates/feature-gate-global_asm.rs | 2 ++ src/test/ui/feature-gates/feature-gate-global_asm.stderr | 2 +- src/test/ui/macros/macro-expanded-include/test.rs | 2 +- src/test/ui/unsafe/inline_asm.mir.stderr | 4 ++-- src/test/ui/unsafe/inline_asm.rs | 1 + src/test/ui/unsafe/inline_asm.thir.stderr | 4 ++-- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/codegen/naked-noinline.rs b/src/test/codegen/naked-noinline.rs index d9e6f6c34ec..d576a53826c 100644 --- a/src/test/codegen/naked-noinline.rs +++ b/src/test/codegen/naked-noinline.rs @@ -1,5 +1,6 @@ // Checks that naked functions are never inlined. // compile-flags: -O -Zmir-opt-level=3 +// needs-asm-support // ignore-wasm32 #![crate_type = "lib"] #![feature(asm)] diff --git a/src/test/ui/feature-gates/feature-gate-global_asm.rs b/src/test/ui/feature-gates/feature-gate-global_asm.rs index 8c9f22e9752..1420eef299b 100644 --- a/src/test/ui/feature-gates/feature-gate-global_asm.rs +++ b/src/test/ui/feature-gates/feature-gate-global_asm.rs @@ -1,3 +1,5 @@ +// needs-asm-support + global_asm!(""); //~ ERROR `global_asm!` is not stable fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-global_asm.stderr b/src/test/ui/feature-gates/feature-gate-global_asm.stderr index e07fbf00d57..7c4d3e3e6e5 100644 --- a/src/test/ui/feature-gates/feature-gate-global_asm.stderr +++ b/src/test/ui/feature-gates/feature-gate-global_asm.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'global_asm': `global_asm!` is not stable enough for use and is subject to change - --> $DIR/feature-gate-global_asm.rs:1:1 + --> $DIR/feature-gate-global_asm.rs:3:1 | LL | global_asm!(""); | ^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-expanded-include/test.rs b/src/test/ui/macros/macro-expanded-include/test.rs index f1a71059a89..6a2b5ef7241 100644 --- a/src/test/ui/macros/macro-expanded-include/test.rs +++ b/src/test/ui/macros/macro-expanded-include/test.rs @@ -1,4 +1,4 @@ -// ignore-emscripten no llvm_asm! support +// needs-asm-support // build-pass (FIXME(62277): could be check-pass?) #![feature(asm)] #![allow(unused)] diff --git a/src/test/ui/unsafe/inline_asm.mir.stderr b/src/test/ui/unsafe/inline_asm.mir.stderr index 7dc62a1ead1..5d9828b5594 100644 --- a/src/test/ui/unsafe/inline_asm.mir.stderr +++ b/src/test/ui/unsafe/inline_asm.mir.stderr @@ -1,5 +1,5 @@ error[E0133]: use of inline assembly is unsafe and requires unsafe function or block - --> $DIR/inline_asm.rs:9:5 + --> $DIR/inline_asm.rs:10:5 | LL | asm!("nop"); | ^^^^^^^^^^^^ use of inline assembly @@ -7,7 +7,7 @@ LL | asm!("nop"); = note: inline assembly is entirely unchecked and can cause undefined behavior error[E0133]: use of inline assembly is unsafe and requires unsafe function or block - --> $DIR/inline_asm.rs:10:5 + --> $DIR/inline_asm.rs:11:5 | LL | llvm_asm!("nop"); | ^^^^^^^^^^^^^^^^^ use of inline assembly diff --git a/src/test/ui/unsafe/inline_asm.rs b/src/test/ui/unsafe/inline_asm.rs index 995292a9903..8e1325bc0a8 100644 --- a/src/test/ui/unsafe/inline_asm.rs +++ b/src/test/ui/unsafe/inline_asm.rs @@ -1,5 +1,6 @@ // revisions: mir thir // [thir]compile-flags: -Z thir-unsafeck +// needs-asm-support #![feature(llvm_asm)] #![feature(asm)] diff --git a/src/test/ui/unsafe/inline_asm.thir.stderr b/src/test/ui/unsafe/inline_asm.thir.stderr index 7dc62a1ead1..5d9828b5594 100644 --- a/src/test/ui/unsafe/inline_asm.thir.stderr +++ b/src/test/ui/unsafe/inline_asm.thir.stderr @@ -1,5 +1,5 @@ error[E0133]: use of inline assembly is unsafe and requires unsafe function or block - --> $DIR/inline_asm.rs:9:5 + --> $DIR/inline_asm.rs:10:5 | LL | asm!("nop"); | ^^^^^^^^^^^^ use of inline assembly @@ -7,7 +7,7 @@ LL | asm!("nop"); = note: inline assembly is entirely unchecked and can cause undefined behavior error[E0133]: use of inline assembly is unsafe and requires unsafe function or block - --> $DIR/inline_asm.rs:10:5 + --> $DIR/inline_asm.rs:11:5 | LL | llvm_asm!("nop"); | ^^^^^^^^^^^^^^^^^ use of inline assembly