Skip to content

Commit c542cd7

Browse files
bjorn3bjorn3
committed
Add needs-asm-support directive to tests where necessary
1 parent 748498e commit c542cd7

19 files changed

+80
-68
lines changed

‎src/test/ui/abi/abi-sysv64-register-usage.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// ignore-android
66
// ignore-arm
77
// ignore-aarch64
8+
// needs-asm-support
89
#![feature(asm_sym)]
910

1011
#[cfg(target_arch = "x86_64")]

‎src/test/ui/asm/aarch64/const.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// only-aarch64
22
// run-pass
3+
// needs-asm-support
34
// revisions: mirunsafeck thirunsafeck
45
// [thirunsafeck]compile-flags: -Z thir-unsafeck
56

‎src/test/ui/asm/aarch64/duplicate-options.fixed

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// only-aarch64
2+
// needs-asm-support
23
// run-rustfix
34

45
use std::arch::asm;

‎src/test/ui/asm/aarch64/duplicate-options.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// only-aarch64
2+
// needs-asm-support
23
// run-rustfix
34

45
use std::arch::asm;

‎src/test/ui/asm/aarch64/duplicate-options.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
error: the `nomem` option was already provided
2-
--> $DIR/duplicate-options.rs:8:33
2+
--> $DIR/duplicate-options.rs:9:33
33
|
44
LL | asm!("", options(nomem, nomem));
55
| ^^^^^ this option was already provided
66

77
error: the `preserves_flags` option was already provided
8-
--> $DIR/duplicate-options.rs:10:43
8+
--> $DIR/duplicate-options.rs:11:43
99
|
1010
LL | asm!("", options(preserves_flags, preserves_flags));
1111
| ^^^^^^^^^^^^^^^ this option was already provided
1212

1313
error: the `nostack` option was already provided
14-
--> $DIR/duplicate-options.rs:12:61
14+
--> $DIR/duplicate-options.rs:13:61
1515
|
1616
LL | asm!("", options(nostack, preserves_flags), options(nostack));
1717
| ^^^^^^^ this option was already provided
1818

1919
error: the `nostack` option was already provided
20-
--> $DIR/duplicate-options.rs:14:35
20+
--> $DIR/duplicate-options.rs:15:35
2121
|
2222
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
2323
| ^^^^^^^ this option was already provided
2424

2525
error: the `nostack` option was already provided
26-
--> $DIR/duplicate-options.rs:14:53
26+
--> $DIR/duplicate-options.rs:15:53
2727
|
2828
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
2929
| ^^^^^^^ this option was already provided
3030

3131
error: the `nostack` option was already provided
32-
--> $DIR/duplicate-options.rs:14:71
32+
--> $DIR/duplicate-options.rs:15:71
3333
|
3434
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
3535
| ^^^^^^^ this option was already provided
3636

3737
error: the `noreturn` option was already provided
38-
--> $DIR/duplicate-options.rs:21:38
38+
--> $DIR/duplicate-options.rs:22:38
3939
|
4040
LL | options(preserves_flags, noreturn),
4141
| ^^^^^^^^ this option was already provided
4242

4343
error: the `nomem` option was already provided
44-
--> $DIR/duplicate-options.rs:22:21
44+
--> $DIR/duplicate-options.rs:23:21
4545
|
4646
LL | options(nomem, nostack),
4747
| ^^^^^ this option was already provided
4848

4949
error: the `noreturn` option was already provided
50-
--> $DIR/duplicate-options.rs:23:21
50+
--> $DIR/duplicate-options.rs:24:21
5151
|
5252
LL | options(noreturn),
5353
| ^^^^^^^^ this option was already provided

‎src/test/ui/asm/aarch64/interpolated-idents.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// only-aarch64
2-
2+
// needs-asm-support
33
use std::arch::asm;
44

55
macro_rules! m {

‎src/test/ui/asm/aarch64/srcloc.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// only-aarch64
22
// build-fail
3+
// needs-asm-support
34
// compile-flags: -Ccodegen-units=1
45

56
use std::arch::asm;

‎src/test/ui/asm/aarch64/srcloc.stderr

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unrecognized instruction mnemonic
2-
--> $DIR/srcloc.rs:11:15
2+
--> $DIR/srcloc.rs:12:15
33
|
44
LL | asm!("invalid_instruction");
55
| ^
@@ -11,7 +11,7 @@ LL | invalid_instruction
1111
| ^
1212

1313
error: unrecognized instruction mnemonic
14-
--> $DIR/srcloc.rs:15:13
14+
--> $DIR/srcloc.rs:16:13
1515
|
1616
LL | invalid_instruction
1717
| ^
@@ -23,7 +23,7 @@ LL | invalid_instruction
2323
| ^
2424

2525
error: unrecognized instruction mnemonic
26-
--> $DIR/srcloc.rs:20:13
26+
--> $DIR/srcloc.rs:21:13
2727
|
2828
LL | invalid_instruction
2929
| ^
@@ -35,7 +35,7 @@ LL | invalid_instruction
3535
| ^
3636

3737
error: unrecognized instruction mnemonic
38-
--> $DIR/srcloc.rs:26:13
38+
--> $DIR/srcloc.rs:27:13
3939
|
4040
LL | invalid_instruction
4141
| ^
@@ -47,7 +47,7 @@ LL | invalid_instruction
4747
| ^
4848

4949
error: unrecognized instruction mnemonic
50-
--> $DIR/srcloc.rs:33:13
50+
--> $DIR/srcloc.rs:34:13
5151
|
5252
LL | invalid_instruction
5353
| ^
@@ -59,7 +59,7 @@ LL | invalid_instruction
5959
| ^
6060

6161
error: unrecognized instruction mnemonic
62-
--> $DIR/srcloc.rs:38:14
62+
--> $DIR/srcloc.rs:39:14
6363
|
6464
LL | asm!(concat!("invalid", "_", "instruction"));
6565
| ^
@@ -71,7 +71,7 @@ LL | invalid_instruction
7171
| ^
7272

7373
error: unrecognized instruction mnemonic
74-
--> $DIR/srcloc.rs:42:14
74+
--> $DIR/srcloc.rs:43:14
7575
|
7676
LL | "invalid_instruction",
7777
| ^
@@ -83,7 +83,7 @@ LL | invalid_instruction
8383
| ^
8484

8585
error: unrecognized instruction mnemonic
86-
--> $DIR/srcloc.rs:48:14
86+
--> $DIR/srcloc.rs:49:14
8787
|
8888
LL | "invalid_instruction",
8989
| ^
@@ -95,7 +95,7 @@ LL | invalid_instruction
9595
| ^
9696

9797
error: unrecognized instruction mnemonic
98-
--> $DIR/srcloc.rs:55:14
98+
--> $DIR/srcloc.rs:56:14
9999
|
100100
LL | "invalid_instruction",
101101
| ^
@@ -107,7 +107,7 @@ LL | invalid_instruction
107107
| ^
108108

109109
error: unrecognized instruction mnemonic
110-
--> $DIR/srcloc.rs:62:13
110+
--> $DIR/srcloc.rs:63:13
111111
|
112112
LL | concat!("invalid", "_", "instruction"),
113113
| ^
@@ -119,7 +119,7 @@ LL | invalid_instruction
119119
| ^
120120

121121
error: unrecognized instruction mnemonic
122-
--> $DIR/srcloc.rs:69:13
122+
--> $DIR/srcloc.rs:70:13
123123
|
124124
LL | concat!("invalid", "_", "instruction"),
125125
| ^
@@ -131,7 +131,7 @@ LL | invalid_instruction
131131
| ^
132132

133133
error: unrecognized instruction mnemonic
134-
--> $DIR/srcloc.rs:76:14
134+
--> $DIR/srcloc.rs:77:14
135135
|
136136
LL | "invalid_instruction1",
137137
| ^
@@ -143,7 +143,7 @@ LL | invalid_instruction1
143143
| ^
144144

145145
error: unrecognized instruction mnemonic
146-
--> $DIR/srcloc.rs:77:14
146+
--> $DIR/srcloc.rs:78:14
147147
|
148148
LL | "invalid_instruction2",
149149
| ^
@@ -155,7 +155,7 @@ LL | invalid_instruction2
155155
| ^
156156

157157
error: unrecognized instruction mnemonic
158-
--> $DIR/srcloc.rs:83:13
158+
--> $DIR/srcloc.rs:84:13
159159
|
160160
LL | concat!(
161161
| ^
@@ -167,7 +167,7 @@ LL | invalid_instruction1
167167
| ^
168168

169169
error: unrecognized instruction mnemonic
170-
--> $DIR/srcloc.rs:83:13
170+
--> $DIR/srcloc.rs:84:13
171171
|
172172
LL | concat!(
173173
| ^
@@ -179,7 +179,7 @@ LL | invalid_instruction2
179179
| ^
180180

181181
error: unrecognized instruction mnemonic
182-
--> $DIR/srcloc.rs:92:13
182+
--> $DIR/srcloc.rs:93:13
183183
|
184184
LL | concat!(
185185
| ^
@@ -191,7 +191,7 @@ LL | invalid_instruction1
191191
| ^
192192

193193
error: unrecognized instruction mnemonic
194-
--> $DIR/srcloc.rs:92:13
194+
--> $DIR/srcloc.rs:93:13
195195
|
196196
LL | concat!(
197197
| ^
@@ -203,7 +203,7 @@ LL | invalid_instruction2
203203
| ^
204204

205205
error: unrecognized instruction mnemonic
206-
--> $DIR/srcloc.rs:96:13
206+
--> $DIR/srcloc.rs:97:13
207207
|
208208
LL | concat!(
209209
| ^
@@ -215,7 +215,7 @@ LL | invalid_instruction3
215215
| ^
216216

217217
error: unrecognized instruction mnemonic
218-
--> $DIR/srcloc.rs:96:13
218+
--> $DIR/srcloc.rs:97:13
219219
|
220220
LL | concat!(
221221
| ^
@@ -227,7 +227,7 @@ LL | invalid_instruction4
227227
| ^
228228

229229
error: unrecognized instruction mnemonic
230-
--> $DIR/srcloc.rs:107:13
230+
--> $DIR/srcloc.rs:108:13
231231
|
232232
LL | concat!(
233233
| ^
@@ -239,7 +239,7 @@ LL | invalid_instruction1
239239
| ^
240240

241241
error: unrecognized instruction mnemonic
242-
--> $DIR/srcloc.rs:107:13
242+
--> $DIR/srcloc.rs:108:13
243243
|
244244
LL | concat!(
245245
| ^
@@ -251,7 +251,7 @@ LL | invalid_instruction2
251251
| ^
252252

253253
error: unrecognized instruction mnemonic
254-
--> $DIR/srcloc.rs:111:13
254+
--> $DIR/srcloc.rs:112:13
255255
|
256256
LL | concat!(
257257
| ^
@@ -263,7 +263,7 @@ LL | invalid_instruction3
263263
| ^
264264

265265
error: unrecognized instruction mnemonic
266-
--> $DIR/srcloc.rs:111:13
266+
--> $DIR/srcloc.rs:112:13
267267
|
268268
LL | concat!(
269269
| ^

‎src/test/ui/asm/aarch64/sym.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// only-aarch64
22
// only-linux
3+
// needs-asm-support
34
// run-pass
45

56
#![feature(thread_local, asm_sym)]

‎src/test/ui/asm/inline-syntax.arm.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | .intel_syntax noprefix
1313
| ^
1414

1515
error: unknown directive
16-
--> $DIR/inline-syntax.rs:31:15
16+
--> $DIR/inline-syntax.rs:32:15
1717
|
1818
LL | asm!(".intel_syntax noprefix", "nop");
1919
| ^
@@ -25,7 +25,7 @@ LL | .intel_syntax noprefix
2525
| ^
2626

2727
error: unknown directive
28-
--> $DIR/inline-syntax.rs:34:15
28+
--> $DIR/inline-syntax.rs:35:15
2929
|
3030
LL | asm!(".intel_syntax aaa noprefix", "nop");
3131
| ^
@@ -37,7 +37,7 @@ LL | .intel_syntax aaa noprefix
3737
| ^
3838

3939
error: unknown directive
40-
--> $DIR/inline-syntax.rs:37:15
40+
--> $DIR/inline-syntax.rs:38:15
4141
|
4242
LL | asm!(".att_syntax noprefix", "nop");
4343
| ^
@@ -49,7 +49,7 @@ LL | .att_syntax noprefix
4949
| ^
5050

5151
error: unknown directive
52-
--> $DIR/inline-syntax.rs:40:15
52+
--> $DIR/inline-syntax.rs:41:15
5353
|
5454
LL | asm!(".att_syntax bbb noprefix", "nop");
5555
| ^
@@ -61,7 +61,7 @@ LL | .att_syntax bbb noprefix
6161
| ^
6262

6363
error: unknown directive
64-
--> $DIR/inline-syntax.rs:43:15
64+
--> $DIR/inline-syntax.rs:44:15
6565
|
6666
LL | asm!(".intel_syntax noprefix; nop");
6767
| ^
@@ -73,7 +73,7 @@ LL | .intel_syntax noprefix; nop
7373
| ^
7474

7575
error: unknown directive
76-
--> $DIR/inline-syntax.rs:49:13
76+
--> $DIR/inline-syntax.rs:50:13
7777
|
7878
LL | .intel_syntax noprefix
7979
| ^

‎src/test/ui/asm/inline-syntax.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
99
//[arm] build-fail
1010
//[arm] needs-llvm-components: arm
11+
// needs-asm-support
1112

1213
#![feature(no_core, lang_items, rustc_attrs)]
1314
#![crate_type = "rlib"]

0 commit comments

Comments
 (0)