Skip to content

Commit 2bd17c1

Browse files
borsbors
committed
Auto merge of #87590 - Amanieu:deprecate_llvm_asm, r=nagisa
Deprecate llvm_asm! We would like to remove `llvm_asm!` from the compiler once `asm!` is stabilized. This PR deprecates `llvm_asm!` to encourage any remaining users to migrate to `asm!` (or if `asm!` is not supported for their target, to add this support to rustc). The only remaining user of `llvm_asm!` in the standard library was `black_box`, which has been rewritten to use volatile operations when `asm!` is not available on the current target. cc `@rust-lang/wg-inline-asm` cc `@RalfJung` for the changes to `black_box` which might affect Miri. r? `@nagisa`
2 parents 2d2bc94 + 632a400 commit 2bd17c1

File tree

78 files changed

+182
-132
lines changed

Some content is hidden

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

78 files changed

+182
-132
lines changed

‎library/core/src/hint.rs

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ pub fn spin_loop() {
155155
#[inline]
156156
#[unstable(feature = "bench_black_box", issue = "64102")]
157157
#[cfg_attr(not(bootstrap), allow(unused_mut))]
158+
#[cfg_attr(bootstrap, allow(deprecated))]
158159
pub fn black_box<T>(mut dummy: T) -> T {
159160
#[cfg(bootstrap)]
160161
// SAFETY: the inline assembly is a no-op.

‎library/core/src/macros/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,10 @@ pub(crate) mod builtin {
13471347
issue = "70173",
13481348
reason = "prefer using the new asm! syntax instead"
13491349
)]
1350+
#[rustc_deprecated(
1351+
since = "1.56",
1352+
reason = "will be removed from the compiler, use asm! instead"
1353+
)]
13501354
#[rustc_builtin_macro]
13511355
#[macro_export]
13521356
macro_rules! llvm_asm {

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// ignore-aarch64
88

99
#![feature(llvm_asm)]
10+
#![allow(deprecated)] // llvm_asm!
1011

1112
#[cfg(target_arch = "x86_64")]
1213
pub extern "sysv64" fn all_the_registers(rdi: i64, rsi: i64, rdx: i64,

‎src/test/ui/asm/naked-functions.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#![feature(naked_functions)]
55
#![feature(or_patterns)]
66
#![crate_type = "lib"]
7+
#![allow(deprecated)] // llvm_asm!
78

89
#[repr(C)]
910
pub struct P { x: u8, y: u16 }

‎src/test/ui/asm/naked-functions.stderr

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
error: asm with the `pure` option must have at least one output
2-
--> $DIR/naked-functions.rs:126:14
2+
--> $DIR/naked-functions.rs:127:14
33
|
44
LL | asm!("", options(readonly, nostack), options(pure));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^
66

77
error: patterns not allowed in naked function parameters
8-
--> $DIR/naked-functions.rs:13:5
8+
--> $DIR/naked-functions.rs:14:5
99
|
1010
LL | mut a: u32,
1111
| ^^^^^
1212

1313
error: patterns not allowed in naked function parameters
14-
--> $DIR/naked-functions.rs:15:5
14+
--> $DIR/naked-functions.rs:16:5
1515
|
1616
LL | &b: &i32,
1717
| ^^
1818

1919
error: patterns not allowed in naked function parameters
20-
--> $DIR/naked-functions.rs:17:6
20+
--> $DIR/naked-functions.rs:18:6
2121
|
2222
LL | (None | Some(_)): Option<std::ptr::NonNull<u8>>,
2323
| ^^^^^^^^^^^^^^
2424

2525
error: patterns not allowed in naked function parameters
26-
--> $DIR/naked-functions.rs:19:5
26+
--> $DIR/naked-functions.rs:20:5
2727
|
2828
LL | P { x, y }: P,
2929
| ^^^^^^^^^^
3030

3131
error: referencing function parameters is not allowed in naked functions
32-
--> $DIR/naked-functions.rs:29:5
32+
--> $DIR/naked-functions.rs:30:5
3333
|
3434
LL | a + 1
3535
| ^
3636
|
3737
= help: follow the calling convention in asm block to use parameters
3838

3939
warning: naked functions must contain a single asm block
40-
--> $DIR/naked-functions.rs:26:1
40+
--> $DIR/naked-functions.rs:27:1
4141
|
4242
LL | / pub unsafe extern "C" fn inc(a: u32) -> u32 {
4343
LL | |
@@ -53,15 +53,15 @@ LL | | }
5353
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
5454

5555
error: referencing function parameters is not allowed in naked functions
56-
--> $DIR/naked-functions.rs:35:31
56+
--> $DIR/naked-functions.rs:36:31
5757
|
5858
LL | asm!("/* {0} */", in(reg) a, options(noreturn));
5959
| ^
6060
|
6161
= help: follow the calling convention in asm block to use parameters
6262

6363
warning: only `const` and `sym` operands are supported in naked functions
64-
--> $DIR/naked-functions.rs:35:23
64+
--> $DIR/naked-functions.rs:36:23
6565
|
6666
LL | asm!("/* {0} */", in(reg) a, options(noreturn));
6767
| ^^^^^^^^^
@@ -70,7 +70,7 @@ LL | asm!("/* {0} */", in(reg) a, options(noreturn));
7070
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
7171

7272
warning: naked functions must contain a single asm block
73-
--> $DIR/naked-functions.rs:42:1
73+
--> $DIR/naked-functions.rs:43:1
7474
|
7575
LL | / pub unsafe extern "C" fn inc_closure(a: u32) -> u32 {
7676
LL | |
@@ -84,7 +84,7 @@ LL | | }
8484
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
8585

8686
warning: only `const` and `sym` operands are supported in naked functions
87-
--> $DIR/naked-functions.rs:62:10
87+
--> $DIR/naked-functions.rs:63:10
8888
|
8989
LL | in(reg) a,
9090
| ^^^^^^^^^
@@ -102,7 +102,7 @@ LL | out(reg) e,
102102
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
103103

104104
warning: asm in naked functions must use `noreturn` option
105-
--> $DIR/naked-functions.rs:59:5
105+
--> $DIR/naked-functions.rs:60:5
106106
|
107107
LL | / asm!("/* {0} {1} {2} {3} {4} {5} {6} */",
108108
LL | |
@@ -117,7 +117,7 @@ LL | | );
117117
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
118118

119119
warning: naked functions must contain a single asm block
120-
--> $DIR/naked-functions.rs:49:1
120+
--> $DIR/naked-functions.rs:50:1
121121
|
122122
LL | / pub unsafe extern "C" fn unsupported_operands() {
123123
LL | |
@@ -141,7 +141,7 @@ LL | | }
141141
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
142142

143143
warning: naked functions must contain a single asm block
144-
--> $DIR/naked-functions.rs:75:1
144+
--> $DIR/naked-functions.rs:76:1
145145
|
146146
LL | / pub extern "C" fn missing_assembly() {
147147
LL | |
@@ -153,7 +153,7 @@ LL | | }
153153
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
154154

155155
warning: asm in naked functions must use `noreturn` option
156-
--> $DIR/naked-functions.rs:84:5
156+
--> $DIR/naked-functions.rs:85:5
157157
|
158158
LL | asm!("");
159159
| ^^^^^^^^^
@@ -162,7 +162,7 @@ LL | asm!("");
162162
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
163163

164164
warning: asm in naked functions must use `noreturn` option
165-
--> $DIR/naked-functions.rs:87:5
165+
--> $DIR/naked-functions.rs:88:5
166166
|
167167
LL | asm!("");
168168
| ^^^^^^^^^
@@ -171,7 +171,7 @@ LL | asm!("");
171171
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
172172

173173
warning: asm in naked functions must use `noreturn` option
174-
--> $DIR/naked-functions.rs:90:5
174+
--> $DIR/naked-functions.rs:91:5
175175
|
176176
LL | asm!("");
177177
| ^^^^^^^^^
@@ -180,7 +180,7 @@ LL | asm!("");
180180
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
181181

182182
warning: naked functions must contain a single asm block
183-
--> $DIR/naked-functions.rs:81:1
183+
--> $DIR/naked-functions.rs:82:1
184184
|
185185
LL | / pub extern "C" fn too_many_asm_blocks() {
186186
LL | |
@@ -202,15 +202,15 @@ LL | | }
202202
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
203203

204204
error: referencing function parameters is not allowed in naked functions
205-
--> $DIR/naked-functions.rs:101:11
205+
--> $DIR/naked-functions.rs:102:11
206206
|
207207
LL | *&y
208208
| ^
209209
|
210210
= help: follow the calling convention in asm block to use parameters
211211

212212
warning: naked functions must contain a single asm block
213-
--> $DIR/naked-functions.rs:98:5
213+
--> $DIR/naked-functions.rs:99:5
214214
|
215215
LL | / pub extern "C" fn inner(y: usize) -> usize {
216216
LL | |
@@ -225,7 +225,7 @@ LL | | }
225225
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
226226

227227
warning: the LLVM-style inline assembly is unsupported in naked functions
228-
--> $DIR/naked-functions.rs:111:5
228+
--> $DIR/naked-functions.rs:112:5
229229
|
230230
LL | llvm_asm!("");
231231
| ^^^^^^^^^^^^^^
@@ -236,7 +236,7 @@ LL | llvm_asm!("");
236236
= note: this warning originates in the macro `llvm_asm` (in Nightly builds, run with -Z macro-backtrace for more info)
237237

238238
warning: naked functions must contain a single asm block
239-
--> $DIR/naked-functions.rs:108:1
239+
--> $DIR/naked-functions.rs:109:1
240240
|
241241
LL | / unsafe extern "C" fn llvm() -> ! {
242242
LL | |
@@ -252,7 +252,7 @@ LL | | }
252252
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
253253

254254
warning: asm options unsupported in naked functions: `nomem`, `preserves_flags`
255-
--> $DIR/naked-functions.rs:119:5
255+
--> $DIR/naked-functions.rs:120:5
256256
|
257257
LL | asm!("", options(nomem, preserves_flags, noreturn));
258258
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -261,7 +261,7 @@ LL | asm!("", options(nomem, preserves_flags, noreturn));
261261
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
262262

263263
warning: asm options unsupported in naked functions: `nostack`, `pure`, `readonly`
264-
--> $DIR/naked-functions.rs:126:5
264+
--> $DIR/naked-functions.rs:127:5
265265
|
266266
LL | asm!("", options(readonly, nostack), options(pure));
267267
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -270,7 +270,7 @@ LL | asm!("", options(readonly, nostack), options(pure));
270270
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
271271

272272
warning: asm in naked functions must use `noreturn` option
273-
--> $DIR/naked-functions.rs:126:5
273+
--> $DIR/naked-functions.rs:127:5
274274
|
275275
LL | asm!("", options(readonly, nostack), options(pure));
276276
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -279,21 +279,21 @@ LL | asm!("", options(readonly, nostack), options(pure));
279279
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
280280

281281
warning: Rust ABI is unsupported in naked functions
282-
--> $DIR/naked-functions.rs:135:15
282+
--> $DIR/naked-functions.rs:136:15
283283
|
284284
LL | pub unsafe fn default_abi() {
285285
| ^^^^^^^^^^^
286286
|
287287
= note: `#[warn(undefined_naked_function_abi)]` on by default
288288

289289
warning: Rust ABI is unsupported in naked functions
290-
--> $DIR/naked-functions.rs:141:29
290+
--> $DIR/naked-functions.rs:142:29
291291
|
292292
LL | pub unsafe extern "Rust" fn rust_abi() {
293293
| ^^^^^^^^
294294

295295
warning: naked functions cannot be inlined
296-
--> $DIR/naked-functions.rs:175:1
296+
--> $DIR/naked-functions.rs:176:1
297297
|
298298
LL | #[inline]
299299
| ^^^^^^^^^
@@ -302,7 +302,7 @@ LL | #[inline]
302302
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
303303

304304
warning: naked functions cannot be inlined
305-
--> $DIR/naked-functions.rs:183:1
305+
--> $DIR/naked-functions.rs:184:1
306306
|
307307
LL | #[inline(always)]
308308
| ^^^^^^^^^^^^^^^^^
@@ -311,7 +311,7 @@ LL | #[inline(always)]
311311
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
312312

313313
warning: naked functions cannot be inlined
314-
--> $DIR/naked-functions.rs:191:1
314+
--> $DIR/naked-functions.rs:192:1
315315
|
316316
LL | #[inline(never)]
317317
| ^^^^^^^^^^^^^^^^
@@ -320,7 +320,7 @@ LL | #[inline(never)]
320320
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
321321

322322
warning: naked functions cannot be inlined
323-
--> $DIR/naked-functions.rs:199:1
323+
--> $DIR/naked-functions.rs:200:1
324324
|
325325
LL | #[inline]
326326
| ^^^^^^^^^
@@ -329,7 +329,7 @@ LL | #[inline]
329329
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
330330

331331
warning: naked functions cannot be inlined
332-
--> $DIR/naked-functions.rs:202:1
332+
--> $DIR/naked-functions.rs:203:1
333333
|
334334
LL | #[inline(always)]
335335
| ^^^^^^^^^^^^^^^^^
@@ -338,7 +338,7 @@ LL | #[inline(always)]
338338
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
339339

340340
warning: naked functions cannot be inlined
341-
--> $DIR/naked-functions.rs:205:1
341+
--> $DIR/naked-functions.rs:206:1
342342
|
343343
LL | #[inline(never)]
344344
| ^^^^^^^^^^^^^^^^

‎src/test/ui/asm/rustfix-asm.fixed

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// only-x86_64
33

44
#![feature(asm, llvm_asm)]
5+
#![allow(deprecated)] // llvm_asm!
56

67
fn main() {
78
unsafe {

‎src/test/ui/asm/rustfix-asm.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// only-x86_64
33

44
#![feature(asm, llvm_asm)]
5+
#![allow(deprecated)] // llvm_asm!
56

67
fn main() {
78
unsafe {

‎src/test/ui/asm/rustfix-asm.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: the legacy LLVM-style asm! syntax is no longer supported
2-
--> $DIR/rustfix-asm.rs:10:9
2+
--> $DIR/rustfix-asm.rs:11:9
33
|
44
LL | asm!("" :: "r" (x));
55
| ----^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | asm!("" :: "r" (x));
1010
= note: alternatively, switch to llvm_asm! to keep your code working as it is
1111

1212
error: the legacy LLVM-style asm! syntax is no longer supported
13-
--> $DIR/rustfix-asm.rs:12:9
13+
--> $DIR/rustfix-asm.rs:13:9
1414
|
1515
LL | asm!("" : "=r" (y));
1616
| ----^^^^^^^^^^^^^^^^

‎src/test/ui/ast-json/ast-json-ice.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// dont-check-compiler-stdout - don't check for any AST change.
1010

1111
#![feature(llvm_asm)]
12+
#![allow(deprecated)] // llvm_asm!
1213

1314
enum V {
1415
A(i32),

‎src/test/ui/borrowck/borrowck-asm.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// ignore-sparc64
99

1010
#![feature(llvm_asm)]
11+
#![allow(deprecated)] // llvm_asm!
1112

1213
#[cfg(any(target_arch = "x86",
1314
target_arch = "x86_64",

0 commit comments

Comments
 (0)