Don't spin expanding stmt macros. #37246
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
I agree that checking consumed tokens does not seem ideal, but I don't have a better idea off the top of my head. cc @jseyfried and @eddyb - any ideas here? |
| @@ -514,8 +514,12 @@ impl<'a> Parser<'a> { | |||
| ExpansionKind::Stmts => { | |||
| let mut stmts = SmallVector::zero(); | |||
| while self.token != token::Eof { | |||
There was a problem hiding this comment.
I believe we could just change this line to
while self.token != token::Eof && self.token != token::CloseDelim(token::Brace) {instead of checking token_consumed for progress.
If we can't make progress when parsing a macro expansion as a statement then we should just bail. This alleviates the symptoms shown in e.g. rust-lang#37113 but it doesn't fix the problem that parsing invalid enum bodies (and others) leaves the parser in a crappy state.
|
r? @jseyfried |
|
📌 Commit eed86fa has been approved by |
Don't spin expanding stmt macros. If we can't make progress when parsing a macro expansion as a statement then we should just bail. This alleviates the symptoms shown in e.g. #37113 and #37234 but it doesn't fix the problem that parsing invalid enum bodies (and others) leaves the parser in a crappy state. I'm not sold on this strategy (checking `tokens_consumed`), so if anyone has a better idea, I'm all ears!
If we can't make progress when parsing a macro expansion as a statement then we should just bail.
This alleviates the symptoms shown in e.g. #37113 and #37234 but it doesn't fix the problem that parsing invalid enum bodies (and others) leaves the parser in a crappy state.
I'm not sold on this strategy (checking
tokens_consumed), so if anyone has a better idea, I'm all ears!