Skip to content

fix: Fix parser getting stuck for bad asm expressions #18625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 6, 2024
Merged

fix: Fix parser getting stuck for bad asm expressions #18625

merged 1 commit into from
Dec 6, 2024

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Dec 6, 2024

Fixes #18623

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 6, 2024
@Veykril Veykril enabled auto-merge December 6, 2024 04:57
@Veykril Veykril added this pull request to the merge queue Dec 6, 2024
Merged via the queue into rust-lang:master with commit cddaf74 Dec 6, 2024
9 checks passed
@Veykril Veykril deleted the push-npnxwpxuzlqz branch December 6, 2024 05:26
ChayimFriedman2 added a commit to ChayimFriedman2/rust-analyzer that referenced this pull request Jul 6, 2025
@ChayimFriedman2
Always bump in the parser in err_and_bump()
87cddda 
Even when at curly braces, otherwise the parser can get stuck.

This has happened in the past in rust-lang#18625, but it was just worked around instead of handling the root of the problem. Now this happened again in rust-lang#20171. IMO we can't let `err_and_bump()` not bump, that's too confusing and invites errors. We can (as I did) workaround the worse recovery instead.
@ChayimFriedman2 ChayimFriedman2 mentioned this pull request Jul 6, 2025
Merged
shashforge pushed a commit to shashforge/rust-analyzer that referenced this pull request Jul 12, 2025
@ChayimFriedman2 @shashforge
Always bump in the parser in err_and_bump()
435406d 
Even when at curly braces, otherwise the parser can get stuck.

This has happened in the past in rust-lang#18625, but it was just worked around instead of handling the root of the problem. Now this happened again in rust-lang#20171. IMO we can't let `err_and_bump()` not bump, that's too confusing and invites errors. We can (as I did) workaround the worse recovery instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mixing up the order of keywords leads to crash
2 participants
@Veykril @rustbot