Skip to content

Commit 2c3cf25

Browse files
authored
Rollup merge of rust-lang#88128 - cuviper:needs-asm-support, r=Mark-Simulacrum
Add needs-asm-support to more tests These were found as test failures on s390x for RHEL and Fedora.
2 parents 2c8afef + 35fd99c commit 2c3cf25

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

src/test/codegen/naked-noinline.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Checks that naked functions are never inlined.
22
// compile-flags: -O -Zmir-opt-level=3
3+
// needs-asm-support
34
// ignore-wasm32
45
#![crate_type = "lib"]
56
#![feature(asm)]
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// needs-asm-support
2+
13
global_asm!(""); //~ ERROR `global_asm!` is not stable
24

35
fn main() {}

src/test/ui/feature-gates/feature-gate-global_asm.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature 'global_asm': `global_asm!` is not stable enough for use and is subject to change
2-
--> $DIR/feature-gate-global_asm.rs:1:1
2+
--> $DIR/feature-gate-global_asm.rs:3:1
33
|
44
LL | global_asm!("");
55
| ^^^^^^^^^^

src/test/ui/macros/macro-expanded-include/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-emscripten no llvm_asm! support
1+
// needs-asm-support
22
// build-pass (FIXME(62277): could be check-pass?)
33
#![feature(asm)]
44
#![allow(unused)]

src/test/ui/unsafe/inline_asm.mir.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0133]: use of inline assembly is unsafe and requires unsafe function or block
2-
--> $DIR/inline_asm.rs:9:5
2+
--> $DIR/inline_asm.rs:10:5
33
|
44
LL | asm!("nop");
55
| ^^^^^^^^^^^^ use of inline assembly
66
|
77
= note: inline assembly is entirely unchecked and can cause undefined behavior
88

99
error[E0133]: use of inline assembly is unsafe and requires unsafe function or block
10-
--> $DIR/inline_asm.rs:10:5
10+
--> $DIR/inline_asm.rs:11:5
1111
|
1212
LL | llvm_asm!("nop");
1313
| ^^^^^^^^^^^^^^^^^ use of inline assembly

src/test/ui/unsafe/inline_asm.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// revisions: mir thir
22
// [thir]compile-flags: -Z thir-unsafeck
3+
// needs-asm-support
34

45
#![feature(llvm_asm)]
56
#![feature(asm)]

src/test/ui/unsafe/inline_asm.thir.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0133]: use of inline assembly is unsafe and requires unsafe function or block
2-
--> $DIR/inline_asm.rs:9:5
2+
--> $DIR/inline_asm.rs:10:5
33
|
44
LL | asm!("nop");
55
| ^^^^^^^^^^^^ use of inline assembly
66
|
77
= note: inline assembly is entirely unchecked and can cause undefined behavior
88

99
error[E0133]: use of inline assembly is unsafe and requires unsafe function or block
10-
--> $DIR/inline_asm.rs:10:5
10+
--> $DIR/inline_asm.rs:11:5
1111
|
1212
LL | llvm_asm!("nop");
1313
| ^^^^^^^^^^^^^^^^^ use of inline assembly

0 commit comments

Comments
 (0)