Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs #139193
Conversation
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
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
compiler-errors
commented
Mar 31, 2025
| @@ -219,6 +219,8 @@ pub(crate) fn coroutine_by_move_body_def_id<'tcx>( | |||
| mir::MirSource::from_instance(InstanceKind::Item(body_def.def_id().to_def_id())); | |||
| dump_mir(tcx, false, "built", &"after", &by_move_body, |_, _| Ok(())); | |||
|
|
|||
| // Feed HIR because we try to access this body's attrs in the inliner. | |||
| body_def.feed_hir(); | |||
There was a problem hiding this comment.
feed_hir both feeds the local_def_id_to_hir_id query, and also the HIR attrs (as an empty list), which is fine here b/c you can't put attrs on the child coroutine anyways.
compiler-errors
force-pushed
the
inline-synthetic
branch
from
e69eeda to
e2d5033
Compare
|
This PR changes a file inside |
eholk
approved these changes
Mar 31, 2025
|
@bors r=eholk |
bors
added
S-waiting-on-bors
|
@bors rollup |
Merged
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 1, 2025
…r=eholk Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs See the comments in the test. I'm surprised that nobody found this[^1] (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before. Fixes rust-lang#134335 r? oli-obk [^1]: Well, `@eholk` found this when working on the `iter! {}` macro, since it more dramatically affects those.
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 1, 2025
…r=eholk Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs See the comments in the test. I'm surprised that nobody found this[^1] (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before. Fixes rust-lang#134335 r? oli-obk [^1]: Well, ``@eholk`` found this when working on the `iter! {}` macro, since it more dramatically affects those.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 1, 2025
Rollup of 12 pull requests Successful merges: - rust-lang#110406 (rustdoc-json: Add test for #[automatically_derived] attribute) - rust-lang#137738 (Make slice iterator constructors unstably const) - rust-lang#138492 (remove `feature(inline_const_pat)`) - rust-lang#138928 (Fix UWP reparse point check) - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names) - rust-lang#139002 (Add release notes for 1.86.0) - rust-lang#139022 (increment depth of nested obligations) - rust-lang#139060 (replace commit placeholder in vendor status with actual commit) - rust-lang#139102 (coverage: Avoid splitting spans during span extraction/refinement) - rust-lang#139129 (Add tests for slice bounds check optimization) - rust-lang#139188 (PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a291a3d008914…) - rust-lang#139193 (Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 1, 2025
…r=eholk Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs See the comments in the test. I'm surprised that nobody found this[^1] (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before. Fixes rust-lang#134335 r? oli-obk [^1]: Well, ```@eholk``` found this when working on the `iter! {}` macro, since it more dramatically affects those.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 1, 2025
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#110406 (rustdoc-json: Add test for #[automatically_derived] attribute) - rust-lang#138790 (Note potential but private items in show_candidates) - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names) - rust-lang#139002 (Add release notes for 1.86.0) - rust-lang#139022 (increment depth of nested obligations) - rust-lang#139129 (Add tests for slice bounds check optimization) - rust-lang#139188 (PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a291a3d008914…) - rust-lang#139193 (Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs) - rust-lang#139202 (Improve docs of ValTreeKind) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 1, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#110406 (rustdoc-json: Add test for #[automatically_derived] attribute) - rust-lang#138790 (Note potential but private items in show_candidates) - rust-lang#139002 (Add release notes for 1.86.0) - rust-lang#139022 (increment depth of nested obligations) - rust-lang#139129 (Add tests for slice bounds check optimization) - rust-lang#139188 (PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a291a3d008914…) - rust-lang#139193 (Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs) - rust-lang#139202 (Improve docs of ValTreeKind) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 2, 2025
Rollup merge of rust-lang#139193 - compiler-errors:inline-synthetic, r=eholk Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs See the comments in the test. I'm surprised that nobody found this[^1] (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before. Fixes rust-lang#134335 r? oli-obk [^1]: Well, ````@eholk```` found this when working on the `iter! {}` macro, since it more dramatically affects those.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See the comments in the test.
I'm surprised that nobody found this1 (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before.
Fixes #134335
r? oli-obk
Footnotes
Well, @eholk found this when working on the
iter! {}macro, since it more dramatically affects those. ↩