Skip to content

Commit 70b1524

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of rust-lang#134385 - taiki-e:ui-asm-minicore, r=compiler-errors
tests/ui/asm: Remove uses of rustc_attrs, lang_items, and decl_macro features by using minicore Follow-up to rust-lang#132516 (comment). This PR do similar things for remaining tests in tests/ui/asm. r? jieyouxu
2 parents c15f2e0 + 86e0eab commit 70b1524

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+537
-618
lines changed

‎tests/auxiliary/minicore.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//! <https://github.com/rust-lang/rust/blob/c0b5cc9003f6464c11ae1c0662c6a7e06f6f5cab/compiler/rustc_codegen_cranelift/example/mini_core.rs>.
1515
// ignore-tidy-linelength
1616

17-
#![feature(no_core, lang_items, rustc_attrs, decl_macro)]
17+
#![feature(no_core, lang_items, rustc_attrs, decl_macro, naked_functions)]
1818
#![allow(unused, improper_ctypes_definitions, internal_features)]
1919
#![feature(asm_experimental_arch)]
2020
#![no_std]
@@ -80,3 +80,11 @@ pub struct UnsafeCell<T: ?Sized> {
8080
pub macro asm("assembly template", $(operands,)* $(options($(option),*))?) {
8181
/* compiler built-in */
8282
}
83+
#[rustc_builtin_macro]
84+
pub macro naked_asm("assembly template", $(operands,)* $(options($(option),*))?) {
85+
/* compiler built-in */
86+
}
87+
#[rustc_builtin_macro]
88+
pub macro global_asm("assembly template", $(operands,)* $(options($(option),*))?) {
89+
/* compiler built-in */
90+
}

‎tests/ui/asm/aarch64/aarch64-sve.rs

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,10 @@
33
//@ needs-asm-support
44

55
#![crate_type = "rlib"]
6-
#![feature(no_core, rustc_attrs, lang_items)]
7-
#![no_core]
86

97
// AArch64 test corresponding to arm64ec-sve.rs.
108

11-
#[lang = "sized"]
12-
trait Sized {}
13-
#[lang = "copy"]
14-
trait Copy {}
15-
16-
impl Copy for f64 {}
17-
18-
#[rustc_builtin_macro]
19-
macro_rules! asm {
20-
() => {};
21-
}
9+
use std::arch::asm;
2210

2311
fn f(x: f64) {
2412
unsafe {

‎tests/ui/asm/aarch64/arm64ec-sve.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1+
//@ add-core-stubs
12
//@ compile-flags: --target arm64ec-pc-windows-msvc
23
//@ needs-asm-support
34
//@ needs-llvm-components: aarch64
45

56
#![crate_type = "rlib"]
6-
#![feature(no_core, rustc_attrs, lang_items)]
7+
#![feature(no_core)]
78
#![no_core]
89

910
// SVE cannot be used for Arm64EC
1011
// https://github.com/rust-lang/rust/pull/131332#issuecomment-2401189142
1112

12-
#[lang = "sized"]
13-
trait Sized {}
14-
#[lang = "copy"]
15-
trait Copy {}
16-
17-
impl Copy for f64 {}
18-
19-
#[rustc_builtin_macro]
20-
macro_rules! asm {
21-
() => {};
22-
}
13+
extern crate minicore;
14+
use minicore::*;
2315

2416
fn f(x: f64) {
2517
unsafe {

‎tests/ui/asm/aarch64/arm64ec-sve.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: cannot use register `p0`: x13, x14, x23, x24, x28, v16-v31, p*, ffr cannot be used for Arm64EC
2-
--> $DIR/arm64ec-sve.rs:26:18
2+
--> $DIR/arm64ec-sve.rs:18:18
33
|
44
LL | asm!("", out("p0") _);
55
| ^^^^^^^^^^^
66

77
error: cannot use register `ffr`: x13, x14, x23, x24, x28, v16-v31, p*, ffr cannot be used for Arm64EC
8-
--> $DIR/arm64ec-sve.rs:28:18
8+
--> $DIR/arm64ec-sve.rs:20:18
99
|
1010
LL | asm!("", out("ffr") _);
1111
| ^^^^^^^^^^^^

‎tests/ui/asm/arm-low-dreg.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
1+
//@ add-core-stubs
12
//@ build-pass
23
//@ compile-flags: --target=armv7-unknown-linux-gnueabihf
34
//@ needs-llvm-components: arm
4-
#![feature(no_core, rustc_attrs, decl_macro, lang_items)]
5+
#![feature(no_core)]
56
#![crate_type = "rlib"]
6-
#![no_std]
77
#![no_core]
88

99
// We accidentally classified "d0"..="d15" as dregs, even though they are in dreg_low16,
1010
// and thus didn't compile them on platforms with only 16 dregs.
1111
// Highlighted in https://github.com/rust-lang/rust/issues/126797
1212

13-
#[lang = "sized"]
14-
trait Sized {}
15-
16-
#[lang = "copy"]
17-
trait Copy {}
18-
19-
impl Copy for f64 {}
20-
21-
#[rustc_builtin_macro]
22-
pub macro asm("assembly template", $(operands,)* $(options($(option),*))?) {
23-
/* compiler built-in */
24-
}
25-
13+
extern crate minicore;
14+
use minicore::*;
2615

2716
fn f(x: f64) -> f64 {
2817
let out: f64;

‎tests/ui/asm/bad-template.aarch64.stderr

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
error: invalid reference to argument at index 0
2-
--> $DIR/bad-template.rs:30:15
2+
--> $DIR/bad-template.rs:19:15
33
|
44
LL | asm!("{}");
55
| ^^ from here
66
|
77
= note: no arguments were given
88

99
error: invalid reference to argument at index 1
10-
--> $DIR/bad-template.rs:32:15
10+
--> $DIR/bad-template.rs:21:15
1111
|
1212
LL | asm!("{1}", in(reg) foo);
1313
| ^^^ from here
1414
|
1515
= note: there is 1 argument
1616

1717
error: argument never used
18-
--> $DIR/bad-template.rs:32:21
18+
--> $DIR/bad-template.rs:21:21
1919
|
2020
LL | asm!("{1}", in(reg) foo);
2121
| ^^^^^^^^^^^ argument never used
2222
|
2323
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {0} */"`
2424

2525
error: there is no argument named `a`
26-
--> $DIR/bad-template.rs:35:16
26+
--> $DIR/bad-template.rs:24:16
2727
|
2828
LL | asm!("{a}");
2929
| ^
3030

3131
error: invalid reference to argument at index 0
32-
--> $DIR/bad-template.rs:37:15
32+
--> $DIR/bad-template.rs:26:15
3333
|
3434
LL | asm!("{}", a = in(reg) foo);
3535
| ^^ --------------- named argument
@@ -38,37 +38,37 @@ LL | asm!("{}", a = in(reg) foo);
3838
|
3939
= note: no positional arguments were given
4040
note: named arguments cannot be referenced by position
41-
--> $DIR/bad-template.rs:37:20
41+
--> $DIR/bad-template.rs:26:20
4242
|
4343
LL | asm!("{}", a = in(reg) foo);
4444
| ^^^^^^^^^^^^^^^
4545

4646
error: named argument never used
47-
--> $DIR/bad-template.rs:37:20
47+
--> $DIR/bad-template.rs:26:20
4848
|
4949
LL | asm!("{}", a = in(reg) foo);
5050
| ^^^^^^^^^^^^^^^ named argument never used
5151
|
5252
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {a} */"`
5353

5454
error: invalid reference to argument at index 1
55-
--> $DIR/bad-template.rs:40:15
55+
--> $DIR/bad-template.rs:29:15
5656
|
5757
LL | asm!("{1}", a = in(reg) foo);
5858
| ^^^ from here
5959
|
6060
= note: no positional arguments were given
6161

6262
error: named argument never used
63-
--> $DIR/bad-template.rs:40:21
63+
--> $DIR/bad-template.rs:29:21
6464
|
6565
LL | asm!("{1}", a = in(reg) foo);
6666
| ^^^^^^^^^^^^^^^ named argument never used
6767
|
6868
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {a} */"`
6969

7070
error: invalid reference to argument at index 0
71-
--> $DIR/bad-template.rs:47:15
71+
--> $DIR/bad-template.rs:36:15
7272
|
7373
LL | asm!("{}", in("x0") foo);
7474
| ^^ ------------ explicit register argument
@@ -77,24 +77,24 @@ LL | asm!("{}", in("x0") foo);
7777
|
7878
= note: no positional arguments were given
7979
note: explicit register arguments cannot be used in the asm template
80-
--> $DIR/bad-template.rs:47:20
80+
--> $DIR/bad-template.rs:36:20
8181
|
8282
LL | asm!("{}", in("x0") foo);
8383
| ^^^^^^^^^^^^
8484
help: use the register name directly in the assembly code
85-
--> $DIR/bad-template.rs:47:20
85+
--> $DIR/bad-template.rs:36:20
8686
|
8787
LL | asm!("{}", in("x0") foo);
8888
| ^^^^^^^^^^^^
8989

9090
error: asm template modifier must be a single character
91-
--> $DIR/bad-template.rs:49:17
91+
--> $DIR/bad-template.rs:38:17
9292
|
9393
LL | asm!("{:foo}", in(reg) foo);
9494
| ^^^
9595

9696
error: multiple unused asm arguments
97-
--> $DIR/bad-template.rs:52:18
97+
--> $DIR/bad-template.rs:41:18
9898
|
9999
LL | asm!("", in(reg) 0, in(reg) 1);
100100
| ^^^^^^^^^ ^^^^^^^^^ argument never used
@@ -104,37 +104,37 @@ LL | asm!("", in(reg) 0, in(reg) 1);
104104
= help: if these arguments are intentionally unused, consider using them in an asm comment: `"/* {0} {1} */"`
105105

106106
error: invalid reference to argument at index 0
107-
--> $DIR/bad-template.rs:58:14
107+
--> $DIR/bad-template.rs:47:14
108108
|
109109
LL | global_asm!("{}");
110110
| ^^ from here
111111
|
112112
= note: no arguments were given
113113

114114
error: invalid reference to argument at index 1
115-
--> $DIR/bad-template.rs:60:14
115+
--> $DIR/bad-template.rs:49:14
116116
|
117117
LL | global_asm!("{1}", const FOO);
118118
| ^^^ from here
119119
|
120120
= note: there is 1 argument
121121

122122
error: argument never used
123-
--> $DIR/bad-template.rs:60:20
123+
--> $DIR/bad-template.rs:49:20
124124
|
125125
LL | global_asm!("{1}", const FOO);
126126
| ^^^^^^^^^ argument never used
127127
|
128128
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {0} */"`
129129

130130
error: there is no argument named `a`
131-
--> $DIR/bad-template.rs:63:15
131+
--> $DIR/bad-template.rs:52:15
132132
|
133133
LL | global_asm!("{a}");
134134
| ^
135135

136136
error: invalid reference to argument at index 0
137-
--> $DIR/bad-template.rs:65:14
137+
--> $DIR/bad-template.rs:54:14
138138
|
139139
LL | global_asm!("{}", a = const FOO);
140140
| ^^ ------------- named argument
@@ -143,43 +143,43 @@ LL | global_asm!("{}", a = const FOO);
143143
|
144144
= note: no positional arguments were given
145145
note: named arguments cannot be referenced by position
146-
--> $DIR/bad-template.rs:65:19
146+
--> $DIR/bad-template.rs:54:19
147147
|
148148
LL | global_asm!("{}", a = const FOO);
149149
| ^^^^^^^^^^^^^
150150

151151
error: named argument never used
152-
--> $DIR/bad-template.rs:65:19
152+
--> $DIR/bad-template.rs:54:19
153153
|
154154
LL | global_asm!("{}", a = const FOO);
155155
| ^^^^^^^^^^^^^ named argument never used
156156
|
157157
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {a} */"`
158158

159159
error: invalid reference to argument at index 1
160-
--> $DIR/bad-template.rs:68:14
160+
--> $DIR/bad-template.rs:57:14
161161
|
162162
LL | global_asm!("{1}", a = const FOO);
163163
| ^^^ from here
164164
|
165165
= note: no positional arguments were given
166166

167167
error: named argument never used
168-
--> $DIR/bad-template.rs:68:20
168+
--> $DIR/bad-template.rs:57:20
169169
|
170170
LL | global_asm!("{1}", a = const FOO);
171171
| ^^^^^^^^^^^^^ named argument never used
172172
|
173173
= help: if this argument is intentionally unused, consider using it in an asm comment: `"/* {a} */"`
174174

175175
error: asm template modifier must be a single character
176-
--> $DIR/bad-template.rs:71:16
176+
--> $DIR/bad-template.rs:60:16
177177
|
178178
LL | global_asm!("{:foo}", const FOO);
179179
| ^^^
180180

181181
error: multiple unused asm arguments
182-
--> $DIR/bad-template.rs:73:17
182+
--> $DIR/bad-template.rs:62:17
183183
|
184184
LL | global_asm!("", const FOO, const FOO);
185185
| ^^^^^^^^^ ^^^^^^^^^ argument never used
@@ -189,7 +189,7 @@ LL | global_asm!("", const FOO, const FOO);
189189
= help: if these arguments are intentionally unused, consider using them in an asm comment: `"/* {0} {1} */"`
190190

191191
warning: formatting may not be suitable for sub-register argument
192-
--> $DIR/bad-template.rs:49:15
192+
--> $DIR/bad-template.rs:38:15
193193
|
194194
LL | asm!("{:foo}", in(reg) foo);
195195
| ^^^^^^ --- for this argument

‎tests/ui/asm/bad-template.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ add-core-stubs
12
//@ revisions: x86_64 aarch64
23

34
//@ [x86_64] compile-flags: --target x86_64-unknown-linux-gnu
@@ -6,23 +7,11 @@
67
//@ [x86_64] needs-llvm-components: x86
78
//@ [aarch64] needs-llvm-components: aarch64
89

9-
#![feature(no_core, lang_items, rustc_attrs)]
10+
#![feature(no_core)]
1011
#![no_core]
1112

12-
#[rustc_builtin_macro]
13-
macro_rules! asm {
14-
() => {};
15-
}
16-
#[rustc_builtin_macro]
17-
macro_rules! global_asm {
18-
() => {};
19-
}
20-
21-
#[lang = "sized"]
22-
trait Sized {}
23-
24-
#[lang = "copy"]
25-
trait Copy {}
13+
extern crate minicore;
14+
use minicore::*;
2615

2716
fn main() {
2817
let mut foo = 0;

0 commit comments

Comments
 (0)