Skip to content

Avoid ICEs when recovering malformed function parameters - #162498

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
TaKO8Ki:fix/parser-arg-recovery-ice
Sep 23, 2026
Merged

rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
TaKO8Ki:fix/parser-arg-recovery-ice

Conversation

@TaKO8Ki

@TaKO8Ki TaKO8Ki commented Sep 8, 2026

Copy link
Copy Markdown
Member

Fixes #160337
Fixes #160490

@rustbot

rustbot commented Sep 8, 2026

Copy link
Copy Markdown
Collaborator

The parser was modified, potentially altering the grammar of (stable) Rust
which would be a breaking change.

cc @fmease

@rustbot 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 Sep 8, 2026
@rustbot

rustbot commented Sep 8, 2026

Copy link
Copy Markdown
Collaborator

r? @fee1-dead

rustbot has assigned @fee1-dead.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 76 candidates
  • Random selection from 20 candidates

@rust-bors

This comment has been minimized.

@fee1-dead

Copy link
Copy Markdown
Member

r=me after rebase

@fee1-dead fee1-dead 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 22, 2026
@TaKO8Ki
TaKO8Ki force-pushed the fix/parser-arg-recovery-ice branch from e9b890b to fc83fc8 Compare September 22, 2026 16:48
@rustbot

rustbot commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@TaKO8Ki

TaKO8Ki commented Sep 22, 2026

Copy link
Copy Markdown
Member Author

@bors r=fee1-dead

@rust-bors

rust-bors Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fc83fc8 has been approved by fee1-dead

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 22, 2026
@rust-log-analyzer

This comment has been minimized.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 22, 2026
…e, r=fee1-dead

Avoid ICEs when recovering malformed function parameters

Fixes rust-lang#160337
@JonathanBrouwer

Copy link
Copy Markdown
Member

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #163175 (comment)

@rust-bors rust-bors Bot 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 Sep 22, 2026
@rust-bors

rust-bors Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#163175), which was unapproved.

View changes since this unapproval

@TaKO8Ki

TaKO8Ki commented Sep 23, 2026

Copy link
Copy Markdown
Member Author

@bors r=fee1-dead

@rust-bors

rust-bors Bot commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e2160bd has been approved by fee1-dead

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 23, 2026
Rollup of 10 pull requests

Successful merges:

 - #161988 (trait solver: Handle reflexive region constraints)
 - #162498 (Avoid ICEs when recovering malformed function parameters)
 - #163181 (revert #162715 due to #163149)
 - #163207 (Update deprecated rustc_hir imports 2)
 - #163216 (Add `inline` attribute to `NonZero::from_str`)
 - #120589 (std::thread::available_parallelism merging linux/android/freebsd version)
 - #162103 (fix(parser): emit targeted diagnostic for fields inside traits)
 - #162340 (When trying to recover from `for<…> dyn …` don't unconditionally treat `dyn` as a keyword)
 - #163094 (Add regression test for first token source file from TokenStream FromStr)
 - #163115 (Point at `'static` obligations from an fn being called)

Failed merges:

 - #162942 (Remove `StashKey::AssociatedTypeSuggestion`)
@rust-bors
rust-bors Bot merged commit 547f9aa into rust-lang:main Sep 23, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 23, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 23, 2026
Rollup merge of #162498 - TaKO8Ki:fix/parser-arg-recovery-ice, r=fee1-dead

Avoid ICEs when recovering malformed function parameters

Fixes #160337
Fixes #160490
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

5 participants