From 062ff4dfdae35e1cf54af7ab11f615a095171803 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Tue, 10 Sep 2024 11:39:46 -0400
Subject: [PATCH] Encode coroutine_by_move_body_def_id in crate metadata
---
.../rustc_metadata/src/rmeta/decoder/cstore_impl.rs | 1 +
compiler/rustc_metadata/src/rmeta/encoder.rs | 11 ++++++++++-
compiler/rustc_metadata/src/rmeta/mod.rs | 1 +
tests/ui/async-await/async-closures/foreign.rs | 5 +++++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
index 53da07aeaa6..b9d287730fa 100644
--- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
@@ -290,6 +290,7 @@ provide! { tcx, def_id, other, cdata,
fn_arg_names => { table }
coroutine_kind => { table_direct }
coroutine_for_closure => { table }
+ coroutine_by_move_body_def_id => { table }
eval_static_initializer => {
Ok(cdata
.root
diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
index b617d5236b9..46dc0696638 100644
--- a/compiler/rustc_metadata/src/rmeta/encoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/encoder.rs
@@ -1488,9 +1488,18 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
if def_kind == DefKind::Closure
&& tcx.type_of(def_id).skip_binder().is_coroutine_closure()
{
+ let coroutine_for_closure = self.tcx.coroutine_for_closure(def_id);
self.tables
.coroutine_for_closure
- .set_some(def_id.index, self.tcx.coroutine_for_closure(def_id).into());
+ .set_some(def_id.index, coroutine_for_closure.into());
+
+ // If this async closure has a by-move body, record it too.
+ if tcx.needs_coroutine_by_move_body_def_id(coroutine_for_closure) {
+ self.tables.coroutine_by_move_body_def_id.set_some(
+ coroutine_for_closure.index,
+ self.tcx.coroutine_by_move_body_def_id(coroutine_for_closure).into(),
+ );
+ }
}
if let DefKind::Static { .. } = def_kind {
if !self.tcx.is_foreign_item(def_id) {
diff --git a/compiler/rustc_metadata/src/rmeta/mod.rs b/compiler/rustc_metadata/src/rmeta/mod.rs
index 8180a507a51..c791a1f541c 100644
--- a/compiler/rustc_metadata/src/rmeta/mod.rs
+++ b/compiler/rustc_metadata/src/rmeta/mod.rs
@@ -446,6 +446,7 @@ define_tables! {
fn_arg_names: Table<DefIndex, LazyArray<Ident>>,
coroutine_kind: Table<DefIndex, hir::CoroutineKind>,
coroutine_for_closure: Table<DefIndex, RawDefId>,
+ coroutine_by_move_body_def_id: Table<DefIndex, RawDefId>,
eval_static_initializer: Table<DefIndex, LazyValue<mir::interpret::ConstAllocation<'static>>>,
trait_def: Table<DefIndex, LazyValue<ty::TraitDef>>,
trait_item_def_id: Table<DefIndex, RawDefId>,
diff --git a/tests/ui/async-await/async-closures/foreign.rs b/tests/ui/async-await/async-closures/foreign.rs
index 50bef9cf11d..ab6fe06a3f4 100644
--- a/tests/ui/async-await/async-closures/foreign.rs
+++ b/tests/ui/async-await/async-closures/foreign.rs
@@ -12,8 +12,13 @@ extern crate foreign;
struct NoCopy;
+async fn call_once(f: impl async FnOnce()) {
+ f().await;
+}
+
fn main() {
block_on::block_on(async {
foreign::closure()().await;
+ call_once(foreign::closure()).await;
});
}