Make TyCtxt::coroutine_layout take coroutine's kind parameter#123021
Merged
bors merged 3 commits intorust-lang:masterfrom Mar 27, 2024
Merged
Make TyCtxt::coroutine_layout take coroutine's kind parameter#123021bors merged 3 commits intorust-lang:masterfrom
TyCtxt::coroutine_layout take coroutine's kind parameter#123021bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
rustbot
added
S-waiting-on-review
compiler-errors
changed the title
tcx.coroutine_layout() over calling tcx.optimized_mir().coroutine_layout() directlyTyCtxt::coroutine_layout take coroutine's kind parameter
compiler-errors
force-pushed
the
coroutine-layout-lol
branch
from
1b7b2cf to
9bda9ac
Compare
Contributor
Author
|
ok, cc @dingxiangfei2009 this should fix the problem. |
Contributor
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2024
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#121843 (Implement `-L KIND=`@RUSTC_BUILTIN/...`)` - rust-lang#122860 (coverage: Re-enable `UnreachablePropagation` for coverage builds) - rust-lang#123021 (Make `TyCtxt::coroutine_layout` take coroutine's kind parameter) - rust-lang#123024 (CFI: Enable KCFI testing of run-pass tests) - rust-lang#123083 (lib: fix some unnecessary_cast clippy lint) - rust-lang#123116 (rustdoc: Swap fields and variant documentations) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2024
Rollup merge of rust-lang#123021 - compiler-errors:coroutine-layout-lol, r=oli-obk Make `TyCtxt::coroutine_layout` take coroutine's kind parameter For coroutines that come from coroutine-closures (i.e. async closures), we may have two kinds of bodies stored in the coroutine; one that takes the closure's captures by reference, and one that takes the captures by move. These currently have identical layouts, but if we do any optimization for these layouts that are related to the upvars, then they will diverge -- e.g. rust-lang#120168 (comment). This PR relaxes the assertion I added in rust-lang#121122, and instead make the `TyCtxt::coroutine_layout` method take the `coroutine_kind_ty` argument from the coroutine, which will allow us to differentiate these by-move and by-ref bodies.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For coroutines that come from coroutine-closures (i.e. async closures), we may have two kinds of bodies stored in the coroutine; one that takes the closure's captures by reference, and one that takes the captures by move.
These currently have identical layouts, but if we do any optimization for these layouts that are related to the upvars, then they will diverge -- e.g. #120168 (comment).
This PR relaxes the assertion I added in #121122, and instead make the
TyCtxt::coroutine_layoutmethod take thecoroutine_kind_tyargument from the coroutine, which will allow us to differentiate these by-move and by-ref bodies.