mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not call query to compute coroutine layout for synthetic body of async closure

Browse Source
This commit is contained in:
Michael Goulet 2024-09-01 05:33:02 -04:00
parent 78d5c04d9c
commit 384aed834c
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_mir_transform/src/validate.rs
View File

@ -1,6 +1,7 @@
//! Validates the MIR to ensure that invariants are upheld.
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_hir as hir;
use rustc_hir::LangItem;
use rustc_index::bit_set::BitSet;
use rustc_index::IndexVec;
@ -714,7 +715,17 @@ fn visit_projection_elem(
// since we may be in the process of computing this MIR in the
// first place.
let layout = if def_id == self.caller_body.source.def_id() {
// FIXME: This is not right for async closures.
self.caller_body.coroutine_layout_raw()
} else if let Some(hir::CoroutineKind::Desugared(
_,
hir::CoroutineSource::Closure,
)) = self.tcx.coroutine_kind(def_id)
&& let ty::ClosureKind::FnOnce =
args.as_coroutine().kind_ty().to_opt_closure_kind().unwrap()
&& self.caller_body.source.def_id()
== self.tcx.coroutine_by_move_body_def_id(def_id)
{
// Same if this is the by-move body of a coroutine-closure.
self.caller_body.coroutine_layout_raw()
} else {
self.tcx.coroutine_layout(def_id, args.as_coroutine().kind_ty())

19
tests/ui/async-await/async-closures/validate-synthetic-body.rs Normal file
View File

@ -0,0 +1,19 @@
//@ check-pass
//@ edition: 2021
#![feature(async_closure)]
// Make sure that we don't hit a query cycle when validating
// the by-move coroutine body for an async closure.
use std::future::Future;
async fn test<Fut: Future>(operation: impl Fn() -> Fut) {
operation().await;
}
pub async fn orchestrate_simple_crud() {
test(async || async {}.await).await;
}
fn main() {}