Prereq3 for async drop - LangItem registration for async_drop_in_plac…

…e<T>::{closure}
rust-lang · azhogin · Aug 26, 2024 · Aug 26, 2024 · Aug 26, 2024 · Aug 27, 2024
commit 50aea7e98fa36beaeddd0e73a03b83890c6cad48
diff --git a/compiler/rustc_hir/src/lang_items.rs b/compiler/rustc_hir/src/lang_items.rs
@@ -183,6 +183,7 @@ language_item_table! {
     AsyncDrop,               sym::async_drop,          async_drop_trait,           Target::Trait,          GenericRequirement::Exact(0);
     AsyncDestruct,           sym::async_destruct,      async_destruct_trait,       Target::Trait,          GenericRequirement::Exact(0);
     AsyncDropInPlace,        sym::async_drop_in_place, async_drop_in_place_fn,     Target::Fn,             GenericRequirement::Exact(1);
+    AsyncDropInPlacePoll,    sym::async_drop_in_place_poll, async_drop_in_place_poll_fn, Target::Closure,  GenericRequirement::Exact(1);
     SurfaceAsyncDropInPlace, sym::surface_async_drop_in_place, surface_async_drop_in_place_fn, Target::Fn, GenericRequirement::Exact(1);
     AsyncDropSurfaceDropInPlace, sym::async_drop_surface_drop_in_place, async_drop_surface_drop_in_place_fn, Target::Fn, GenericRequirement::Exact(1);
     AsyncDropSlice,          sym::async_drop_slice,    async_drop_slice_fn,        Target::Fn,             GenericRequirement::Exact(1);

diff --git a/compiler/rustc_passes/src/lang_items.rs b/compiler/rustc_passes/src/lang_items.rs
@@ -58,6 +58,7 @@ impl<'ast, 'tcx> LanguageItemCollector<'ast, 'tcx> {
         &mut self,
         actual_target: Target,
         def_id: LocalDefId,
+        cor_def_id: Option<LocalDefId>,
         attrs: &'ast [ast::Attribute],
         item_span: Span,
         generics: Option<&'ast ast::Generics>,
@@ -74,6 +75,18 @@ impl<'ast, 'tcx> LanguageItemCollector<'ast, 'tcx> {
                         generics,
                         actual_target,
                     );
+                    // We need to register LangItem::AsyncDropInPlacePoll
+                    // for async_drop_in_place<T>::{closure}
+                    if cor_def_id.is_some() && lang_item == LangItem::AsyncDropInPlace {
+                        self.collect_item_extended(
+                            LangItem::AsyncDropInPlacePoll,
+                            cor_def_id.unwrap(),
+                            item_span,
+                            attr_span,
+                            generics,
+                            actual_target,
+                        );
+                    }
                 }
                 // Known lang item with attribute on incorrect target.
                 Some(lang_item) => {
@@ -289,10 +302,18 @@ impl<'ast, 'tcx> visit::Visitor<'ast> for LanguageItemCollector<'ast, 'tcx> {
                 unreachable!("macros should have been expanded")
             }
         };
+        let cor_def_id = if let ast::ItemKind::Fn(box ast::Fn { sig, .. }) = &i.kind
+            && let Some(kind) = sig.header.coroutine_kind
+        {
+            self.resolver.node_id_to_def_id.get(&kind.closure_id()).copied()
+        } else {
+            None
+        };
 
         self.check_for_lang(
             target,
             self.resolver.node_id_to_def_id[&i.id],
+            cor_def_id,
             &i.attrs,
             i.span,
             i.opt_generics(),
@@ -308,6 +329,7 @@ impl<'ast, 'tcx> visit::Visitor<'ast> for LanguageItemCollector<'ast, 'tcx> {
             self.check_for_lang(
                 Target::Variant,
                 self.resolver.node_id_to_def_id[&variant.id],
+                None,
                 &variant.attrs,
                 variant.span,
                 None,
@@ -350,6 +372,7 @@ impl<'ast, 'tcx> visit::Visitor<'ast> for LanguageItemCollector<'ast, 'tcx> {
         self.check_for_lang(
             target,
             self.resolver.node_id_to_def_id[&i.id],
+            None,
             &i.attrs,
             i.span,
             generics,

diff --git a/compiler/rustc_passes/src/lib.rs b/compiler/rustc_passes/src/lib.rs
@@ -8,6 +8,7 @@
 #![allow(internal_features)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
+#![feature(box_patterns)]
 #![feature(let_chains)]
 #![feature(map_try_insert)]
 #![feature(rustdoc_internals)]

diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -453,6 +453,7 @@ symbols! {
         async_drop_either,
         async_drop_fuse,
         async_drop_in_place,
+        async_drop_in_place_poll,
         async_drop_noop,
         async_drop_slice,
         async_drop_surface_drop_in_place,