Rollup merge of #120897 - compiler-errors:foreign-async-closure, r=oli-obk

Encode `coroutine_for_closure` for foreign crates

Async closures (and "coroutine closures" in general) need to have their child coroutine encoded. This PR does that.

r? oli-obk
This commit is contained in:
Matthias Krüger 2024-02-11 23:19:10 +01:00 committed by GitHub
commit aeafbbeded
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 35 additions and 0 deletions

View File

@ -250,6 +250,7 @@ provide! { tcx, def_id, other, cdata,
asyncness => { table_direct }
fn_arg_names => { table }
coroutine_kind => { table_direct }
coroutine_for_closure => { table }
trait_def => { table }
deduced_param_attrs => { table }
is_type_alias_impl_trait => {

View File

@ -1447,6 +1447,13 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
{
self.tables.coroutine_kind.set(def_id.index, Some(coroutine_kind))
}
if def_kind == DefKind::Closure
&& tcx.type_of(def_id).skip_binder().is_coroutine_closure()
{
self.tables
.coroutine_for_closure
.set_some(def_id.index, self.tcx.coroutine_for_closure(def_id).into());
}
if let DefKind::Enum | DefKind::Struct | DefKind::Union = def_kind {
self.encode_info_for_adt(local_id);
}

View File

@ -443,6 +443,7 @@ define_tables! {
asyncness: Table<DefIndex, ty::Asyncness>,
fn_arg_names: Table<DefIndex, LazyArray<Ident>>,
coroutine_kind: Table<DefIndex, hir::CoroutineKind>,
coroutine_for_closure: Table<DefIndex, RawDefId>,
trait_def: Table<DefIndex, LazyValue<ty::TraitDef>>,
trait_item_def_id: Table<DefIndex, RawDefId>,
expn_that_defined: Table<DefIndex, LazyValue<ExpnId>>,

View File

@ -0,0 +1,7 @@
// edition:2021
#![feature(async_closure)]
pub fn closure() -> impl async Fn() {
async || { /* Don't really need to do anything here. */ }
}

View File

@ -0,0 +1,19 @@
// aux-build:block-on.rs
// aux-build:foreign.rs
// edition:2021
// build-pass
#![feature(async_closure)]
use std::future::Future;
extern crate block_on;
extern crate foreign;
struct NoCopy;
fn main() {
block_on::block_on(async {
foreign::closure()().await;
});
}