improve error message when `global_asm!` uses `asm!` options by folkertdev · Pull Request #128207 · rust-lang/rust

folkertdev · 2024-07-25T20:49:50Z

specifically, what was

error: expected one of `)`, `att_syntax`, or `raw`, found `preserves_flags`
  --> $DIR/bad-options.rs:45:25
   |
LL | global_asm!("", options(preserves_flags));
   |                         ^^^^^^^^^^^^^^^ expected one of `)`, `att_syntax`, or `raw`

is now

error: the `preserves_flags` option cannot be used with `global_asm!`
  --> $DIR/bad-options.rs:45:25
   |
LL | global_asm!("", options(preserves_flags));
   |                         ^^^^^^^^^^^^^^^ the `preserves_flags` option is not meaningful for global-scoped inline assembly

mirroring the phrasing of the reference.

This is also a bit of a refactor for a future naked_asm! macro (for use in #[naked] functions). Currently this sort of error can come up when switching from inline to global asm, or when a user just isn't that experienced with assembly. With naked_asm! added to the mix hitting this error is more likely.

rustbot · 2024-07-25T20:49:58Z

r? @cjgillot

rustbot has assigned @cjgillot.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

workingjubilee · 2024-07-25T20:54:57Z

r? @Amanieu

compiler/rustc_builtin_macros/src/errors.rs

compiler/rustc_builtin_macros/src/asm.rs

Amanieu · 2024-07-27T08:31:21Z

@bors r+

bors · 2024-07-27T08:31:24Z

📌 Commit 8859da0 has been approved by Amanieu

It is now in the queue for this repository.

…r=Amanieu improve error message when `global_asm!` uses `asm!` options specifically, what was error: expected one of `)`, `att_syntax`, or `raw`, found `preserves_flags` --> $DIR/bad-options.rs:45:25 | LL | global_asm!("", options(preserves_flags)); | ^^^^^^^^^^^^^^^ expected one of `)`, `att_syntax`, or `raw` is now error: the `preserves_flags` option cannot be used with `global_asm!` --> $DIR/bad-options.rs:45:25 | LL | global_asm!("", options(preserves_flags)); | ^^^^^^^^^^^^^^^ the `preserves_flags` option is not meaningful for global-scoped inline assembly mirroring the phrasing of the [reference](https://doc.rust-lang.org/reference/inline-assembly.html#options). This is also a bit of a refactor for a future `naked_asm!` macro (for use in `#[naked]` functions). Currently this sort of error can come up when switching from inline to global asm, or when a user just isn't that experienced with assembly. With `naked_asm!` added to the mix hitting this error is more likely.

…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#128006 (Make `missing_fragment_specifier` an error in edition 2024) - rust-lang#128207 (improve error message when `global_asm!` uses `asm!` options) - rust-lang#128266 (update `rust.channel` default value documentation) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-07-27T13:03:39Z

@bors r-
#128268 (comment)

folkertdev · 2024-07-27T15:22:44Z

so CI fails on some of the aarch64 tests. I'm on x86, so how am I supposed to update those? for some using no_core works, but for tests/ui/asm/aarch64/parse-error.rs it doesn't because that actually used std (the format macro specifically)

Amanieu · 2024-07-27T16:39:02Z

You can run the UI tests with a cross-compiler by running ./x.py test tests/ui/asm --target aarch64-unknown-linux-gnu --bless

Amanieu · 2024-07-27T17:11:58Z

tests/ui/asm/unsupported-option.rs

@@ -0,0 +1,10 @@
+//@ run-rustfix


This probably needs //@ needs-asm-support otherwise it will fail on targets without asm support.

Amanieu · 2024-07-27T17:28:43Z

@bors r+

bors · 2024-07-27T17:28:45Z

📌 Commit 33b5ca9 has been approved by Amanieu

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - rust-lang#125897 (from_ref, from_mut: clarify documentation) - rust-lang#128207 (improve error message when `global_asm!` uses `asm!` options) - rust-lang#128241 (Remove logic to suggest clone of function output) - rust-lang#128259 ([illumos/solaris] set MSG_NOSIGNAL while writing to sockets) - rust-lang#128262 (Delete `SimplifyArmIdentity` and `SimplifyBranchSame` tests) - rust-lang#128266 (update `rust.channel` default value documentation) - rust-lang#128267 (Add rustdoc GUI test to check title with and without search) - rust-lang#128271 (Disable jump threading of float equality) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#128207 - folkertdev:asm-parser-generalize, r=Amanieu improve error message when `global_asm!` uses `asm!` options specifically, what was error: expected one of `)`, `att_syntax`, or `raw`, found `preserves_flags` --> $DIR/bad-options.rs:45:25 | LL | global_asm!("", options(preserves_flags)); | ^^^^^^^^^^^^^^^ expected one of `)`, `att_syntax`, or `raw` is now error: the `preserves_flags` option cannot be used with `global_asm!` --> $DIR/bad-options.rs:45:25 | LL | global_asm!("", options(preserves_flags)); | ^^^^^^^^^^^^^^^ the `preserves_flags` option is not meaningful for global-scoped inline assembly mirroring the phrasing of the [reference](https://doc.rust-lang.org/reference/inline-assembly.html#options). This is also a bit of a refactor for a future `naked_asm!` macro (for use in `#[naked]` functions). Currently this sort of error can come up when switching from inline to global asm, or when a user just isn't that experienced with assembly. With `naked_asm!` added to the mix hitting this error is more likely.

…operand, r=Amanieu improve error message when `global_asm!` uses `asm!` operands follow-up to rust-lang#128207 what was ``` error: expected expression, found keyword `in` --> src/lib.rs:1:31 | 1 | core::arch::global_asm!("{}", in(reg)); | ^^ expected expression ``` becomes ``` error: the `in` operand cannot be used with `global_asm!` --> $DIR/parse-error.rs:150:19 | LL | global_asm!("{}", in(reg)); | ^^ the `in` operand is not meaningful for global-scoped inline assembly, remove it ``` the span of the error is just the keyword, which means that we can't create a machine-applicable suggestion here. The alternative would be to attempt to parse the full operand, but then if there are syntax errors in the operand those would be presented to the user, even though the parser already knows that the output won't be valid. Also that would require more complexity in the parser. So I think this is a nice improvement at very low cost.

Rollup merge of rust-lang#128305 - folkertdev:asm-parser-unsupported-operand, r=Amanieu improve error message when `global_asm!` uses `asm!` operands follow-up to rust-lang#128207 what was ``` error: expected expression, found keyword `in` --> src/lib.rs:1:31 | 1 | core::arch::global_asm!("{}", in(reg)); | ^^ expected expression ``` becomes ``` error: the `in` operand cannot be used with `global_asm!` --> $DIR/parse-error.rs:150:19 | LL | global_asm!("{}", in(reg)); | ^^ the `in` operand is not meaningful for global-scoped inline assembly, remove it ``` the span of the error is just the keyword, which means that we can't create a machine-applicable suggestion here. The alternative would be to attempt to parse the full operand, but then if there are syntax errors in the operand those would be presented to the user, even though the parser already knows that the output won't be valid. Also that would require more complexity in the parser. So I think this is a nice improvement at very low cost.

…r=Amanieu improve error message when `global_asm!` uses `asm!` operands follow-up to rust-lang/rust#128207 what was ``` error: expected expression, found keyword `in` --> src/lib.rs:1:31 | 1 | core::arch::global_asm!("{}", in(reg)); | ^^ expected expression ``` becomes ``` error: the `in` operand cannot be used with `global_asm!` --> $DIR/parse-error.rs:150:19 | LL | global_asm!("{}", in(reg)); | ^^ the `in` operand is not meaningful for global-scoped inline assembly, remove it ``` the span of the error is just the keyword, which means that we can't create a machine-applicable suggestion here. The alternative would be to attempt to parse the full operand, but then if there are syntax errors in the operand those would be presented to the user, even though the parser already knows that the output won't be valid. Also that would require more complexity in the parser. So I think this is a nice improvement at very low cost.

improve error message when global_asm! uses asm! options

d3858f7

rustbot assigned cjgillot Jul 25, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 25, 2024

rustbot assigned Amanieu and unassigned cjgillot Jul 25, 2024

tgross35 reviewed Jul 25, 2024

View reviewed changes

compiler/rustc_builtin_macros/src/errors.rs Show resolved Hide resolved

tgross35 reviewed Jul 25, 2024

View reviewed changes

compiler/rustc_builtin_macros/src/asm.rs Outdated Show resolved Hide resolved

folkertdev added 2 commits July 26, 2024 00:08

refactor the if if

73fde17

add run-rustfix test for machine-applicable suggestion

8859da0

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 27, 2024

matthiaskrgr mentioned this pull request Jul 27, 2024

Rollup of 3 pull requests #128268

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 27, 2024

update aarch64 asm tests

3e4ddc3

Amanieu reviewed Jul 27, 2024

View reviewed changes

add needs-asm-support to tests/ui/asm/unsupported-option.rs

33b5ca9

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 27, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2024

tgross35 mentioned this pull request Jul 27, 2024

Rollup of 8 pull requests #128278

Merged

bors merged commit 9164dbd into rust-lang:master Jul 27, 2024

rustbot added this to the 1.82.0 milestone Jul 27, 2024

folkertdev mentioned this pull request Jul 28, 2024

improve error message when global_asm! uses asm! operands #128305

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

improve error message when `global_asm!` uses `asm!` options#128207

improve error message when `global_asm!` uses `asm!` options#128207
bors merged 5 commits intorust-lang:masterfrom
folkertdev:asm-parser-generalize

folkertdev commented Jul 25, 2024

Uh oh!

rustbot commented Jul 25, 2024

Uh oh!

workingjubilee commented Jul 25, 2024

Uh oh!

Uh oh!

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

bors commented Jul 27, 2024

Uh oh!

matthiaskrgr commented Jul 27, 2024

Uh oh!

folkertdev commented Jul 27, 2024

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

Amanieu Jul 27, 2024

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

bors commented Jul 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

folkertdev commented Jul 25, 2024

Uh oh!

rustbot commented Jul 25, 2024

Uh oh!

workingjubilee commented Jul 25, 2024

Uh oh!

Uh oh!

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

bors commented Jul 27, 2024

Uh oh!

matthiaskrgr commented Jul 27, 2024

Uh oh!

folkertdev commented Jul 27, 2024

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

Amanieu Jul 27, 2024

Choose a reason for hiding this comment

Uh oh!

Amanieu commented Jul 27, 2024

Uh oh!

bors commented Jul 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants