nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #139193 - compiler-errors:inline-synthetic, r=eholk

Browse Source 
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 #134335

r? oli-obk

[^1]: Well, ````@eholk```` found this when working on the `iter! {}` macro, since it more dramatically affects those.
This commit is contained in:
Matthias Krüger 2025-04-01 20:25:24 +02:00 committed by GitHub
commit aafb17ddca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_mir_transform/src/coroutine/by_move_body.rs
View File

@ -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();
// Inherited from the by-ref coroutine.
body_def.codegen_fn_attrs(tcx.codegen_fn_attrs(coroutine_def_id).clone());
body_def.coverage_attr_on(tcx.coverage_attr_on(coroutine_def_id));

12
tests/crashes/134335.rs
View File

@ -1,12 +0,0 @@
//@ known-bug: #134335
//@compile-flags: -Zunstable-options --edition=2024 --crate-type=lib
pub async fn async_closure(x: &mut i32) {
let c = async move || {
*x += 1;
};
call_once(c).await;
}
fn call_once<T>(f: impl FnOnce() -> T) -> T {
f()
}

28
tests/ui/async-await/async-closures/by-move-body-inlined-attrs.rs Normal file
View File

@ -0,0 +1,28 @@
//@ check-pass
//@ compile-flags: -Zinline-mir -Zvalidate-mir
//@ edition: 2024
// See comment below.
use std::future::Future;
use std::pin::pin;
use std::task::{Context, Waker};
fn call_once<T>(f: impl FnOnce() -> T) -> T { f() }
fn main() {
let x = async || {};
// We first inline `call_once<{async closure}>`.
//
// This gives us a future whose type is the "FnOnce" flavor of the async closure's
// child coroutine. The body of this coroutine is synthetic, which we synthesize in
// the by-move body query.
let fut = pin!(call_once(x));
// We then try to inline that body in this poll call.
//
// The inliner does some inlinability checks; one of these checks involves checking
// the body for the `#[rustc_no_mir_inline]` attribute. Since the synthetic body had
// no HIR synthesized, but it's still a local def id, we end up ICEing in the
// `local_def_id_to_hir_id` call when trying to read its attrs.
fut.poll(&mut Context::from_waker(Waker::noop()));
}