forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#62956 - ia0:fix_62831, r=petrochenkov
Implement slow-path for FirstSets::first When 2 or more sequences share the same span, we can't use the precomputed map for their first set. So we compute it recursively. Fixes rust-lang#62831.
- Loading branch information
Showing
4 changed files
with
119 additions
and
27 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 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,36 @@ | ||
// force-host | ||
// no-prefer-dynamic | ||
|
||
#![crate_type = "proc-macro"] | ||
#![feature(proc_macro_span, proc_macro_hygiene, proc_macro_quote)] | ||
|
||
extern crate proc_macro; | ||
|
||
use proc_macro::{quote, Span, TokenStream}; | ||
|
||
fn assert_same_span(a: Span, b: Span) { | ||
assert_eq!(a.start(), b.start()); | ||
assert_eq!(a.end(), b.end()); | ||
} | ||
|
||
// This macro generates a macro with the same macro definition as `manual_foo` in | ||
// `same-sequence-span.rs` but with the same span for all sequences. | ||
#[proc_macro] | ||
pub fn make_foo(_: TokenStream) -> TokenStream { | ||
let result = quote! { | ||
macro_rules! generated_foo { | ||
(1 $$x:expr $$($$y:tt,)* $$(= $$z:tt)*) => {}; | ||
} | ||
}; | ||
|
||
// Check that all spans are equal. | ||
let mut span = None; | ||
for tt in result.clone() { | ||
match span { | ||
None => span = Some(tt.span()), | ||
Some(span) => assert_same_span(tt.span(), span), | ||
} | ||
} | ||
|
||
result | ||
} |
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,23 @@ | ||
// aux-build:proc_macro_sequence.rs | ||
|
||
// Regression test for issue #62831: Check that multiple sequences with the same span in the | ||
// left-hand side of a macro definition behave as if they had unique spans, and in particular that | ||
// they don't crash the compiler. | ||
|
||
#![feature(proc_macro_hygiene)] | ||
#![allow(unused_macros)] | ||
|
||
extern crate proc_macro_sequence; | ||
|
||
// When ignoring spans, this macro has the same macro definition as `generated_foo` in | ||
// `proc_macro_sequence.rs`. | ||
macro_rules! manual_foo { | ||
(1 $x:expr $($y:tt,)* //~ERROR `$x:expr` may be followed by `$y:tt` | ||
$(= $z:tt)* //~ERROR `$x:expr` may be followed by `=` | ||
) => {}; | ||
} | ||
|
||
proc_macro_sequence::make_foo!(); //~ERROR `$x:expr` may be followed by `$y:tt` | ||
//~^ERROR `$x:expr` may be followed by `=` | ||
|
||
fn main() {} |
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,34 @@ | ||
error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments | ||
--> $DIR/same-sequence-span.rs:15:18 | ||
| | ||
LL | (1 $x:expr $($y:tt,)* | ||
| ^^^^^ not allowed after `expr` fragments | ||
| | ||
= note: allowed there are: `=>`, `,` or `;` | ||
|
||
error: `$x:expr` may be followed by `=`, which is not allowed for `expr` fragments | ||
--> $DIR/same-sequence-span.rs:16:18 | ||
| | ||
LL | $(= $z:tt)* | ||
| ^ not allowed after `expr` fragments | ||
| | ||
= note: allowed there are: `=>`, `,` or `;` | ||
|
||
error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments | ||
--> $DIR/same-sequence-span.rs:20:1 | ||
| | ||
LL | proc_macro_sequence::make_foo!(); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not allowed after `expr` fragments | ||
| | ||
= note: allowed there are: `=>`, `,` or `;` | ||
|
||
error: `$x:expr` may be followed by `=`, which is not allowed for `expr` fragments | ||
--> $DIR/same-sequence-span.rs:20:1 | ||
| | ||
LL | proc_macro_sequence::make_foo!(); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not allowed after `expr` fragments | ||
| | ||
= note: allowed there are: `=>`, `,` or `;` | ||
|
||
error: aborting due to 4 previous errors | ||
|