Skip to content

Don't ICE when generating Fn shim for async closure with borrowck error#130410

Merged
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:shim-borrowck-err
Sep 16, 2024
Merged

Don't ICE when generating Fn shim for async closure with borrowck error#130410
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:shim-borrowck-err

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

Turn an assumption that I had originally written as an assert into a delayed bug, because this shim code is reachable even if we have borrowck errors via the MIR inliner.

Fixes #129262.

@rustbot

rustbot commented Sep 15, 2024

Copy link
Copy Markdown
Collaborator

r? @estebank

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

@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 15, 2024
@rustbot

rustbot commented Sep 15, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@jieyouxu jieyouxu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this seems reasonable.

@jieyouxu jieyouxu assigned jieyouxu and unassigned estebank Sep 16, 2024
@jieyouxu

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Sep 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 21b740b has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2024
@compiler-errors

Copy link
Copy Markdown
Contributor Author

Thanks for the review @jieyouxu. I gotta remove a crashes test on this one too

@bors r-

@bors bors 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 16, 2024
@compiler-errors

Copy link
Copy Markdown
Contributor Author

@bors r=jieyouxu

@bors

bors commented Sep 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 57a7e51 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#123436 (linker: Allow MSVC to use import libraries following the Meson/MinGW convention)
 - rust-lang#130410 (Don't ICE when generating `Fn` shim for async closure with borrowck error)
 - rust-lang#130412 (Don't ICE when RPITIT captures more method args than trait definition)
 - rust-lang#130436 (Ignore reduce-fadd-unordered on SGX platform)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9a1004c into rust-lang:master Sep 16, 2024
@rustbot rustbot added this to the 1.83.0 milestone Sep 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2024
Rollup merge of rust-lang#130410 - compiler-errors:shim-borrowck-err, r=jieyouxu

Don't ICE when generating `Fn` shim for async closure with borrowck error

Turn an assumption that I had originally written as an assert into a delayed bug, because this shim code is reachable even if we have borrowck errors via the MIR inliner.

Fixes rust-lang#129262.
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

Development

Successfully merging this pull request may close these issues.

ICE: field should be captured by immutable ref if we have an Fn instance

5 participants