-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix error span when arg to asm!() is a macro call
When the template string passed to asm!() is produced by a macro call like concat!() we were producing wrong error spans. Now in the case of a macro call we just use the entire arg to asm!(), macro call and all, as the error span.
- Loading branch information
Showing
4 changed files
with
63 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Regression test for ICE #129503 | ||
|
||
|
||
// Tests that we come up with decent error spans | ||
// when the template fed to `asm!()` is itself a | ||
// macro call like `concat!()` and should not ICE | ||
|
||
use std::arch::asm; | ||
|
||
fn main() { | ||
// Should not ICE | ||
asm!(concat!(r#"lJ�.�"#, "r} {}")); | ||
//~^ ERROR invalid asm template string: unmatched `}` found | ||
|
||
|
||
// Macro call template: should point to | ||
// everything within `asm!()` as error span | ||
asm!(concat!("abc", "r} {}")); | ||
//~^ ERROR invalid asm template string: unmatched `}` found | ||
|
||
|
||
// Literal template: should point precisely to | ||
// just the `}` as error span | ||
asm!("abc", "r} {}"); | ||
//~^ ERROR invalid asm template string: unmatched `}` found | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
error: invalid asm template string: unmatched `}` found | ||
--> $DIR/ice-bad-err-span-in-template-129503.rs:12:10 | ||
| | ||
LL | asm!(concat!(r#"lJ�.�"#, "r} {}")); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unmatched `}` in asm template string | ||
| | ||
= note: if you intended to print `}`, you can escape it using `}}` | ||
= note: this error originates in the macro `concat` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: invalid asm template string: unmatched `}` found | ||
--> $DIR/ice-bad-err-span-in-template-129503.rs:18:10 | ||
| | ||
LL | asm!(concat!("abc", "r} {}")); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^ unmatched `}` in asm template string | ||
| | ||
= note: if you intended to print `}`, you can escape it using `}}` | ||
= note: this error originates in the macro `concat` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: invalid asm template string: unmatched `}` found | ||
--> $DIR/ice-bad-err-span-in-template-129503.rs:24:19 | ||
| | ||
LL | asm!("abc", "r} {}"); | ||
| ^ unmatched `}` in asm template string | ||
| | ||
= note: if you intended to print `}`, you can escape it using `}}` | ||
|
||
error: aborting due to 3 previous errors | ||
|