Don't use typeck_root_def_id in codegen for finding closure's root

Author: compiler-errors

compiler/rustc_codegen_cranelift/src/debuginfo/mod.rs

@@ -198,8 +198,15 @@ impl DebugContext {
         let mut name = String::new();
         type_names::push_item_name(tcx, instance.def_id(), false, &mut name);
 
-        // Find the enclosing function, in case this is a closure.
-        let enclosing_fn_def_id = tcx.typeck_root_def_id(instance.def_id());
+        // Find the enclosing function, in case this is a closure, coroutine,
+        // coroutine-closure, or synthetic MIR body.
+        let mut enclosing_fn_def_id = def_id;
+        while matches!(
+            tcx.def_kind(enclosing_fn_def_id),
+            DefKind::Closure | DefKind::SyntheticCoroutineBody
+        ) {
+            enclosing_fn_def_id = tcx.parent(enclosing_fn_def_id);
+        }
 
         // We look up the generics of the enclosing function and truncate the args
         // to their length in order to cut off extra stuff that might be in there for

compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

@@ -11,6 +11,7 @@ use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext, Variab
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::unord::UnordMap;
+use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, DefIdMap};
 use rustc_index::IndexVec;
 use rustc_middle::mir;
@@ -332,8 +333,15 @@ impl<'ll, 'tcx> DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
         let mut name = String::with_capacity(64);
         type_names::push_item_name(tcx, def_id, false, &mut name);
 
-        // Find the enclosing function, in case this is a closure.
-        let enclosing_fn_def_id = tcx.typeck_root_def_id(def_id);
+        // Find the enclosing function, in case this is a closure, coroutine,
+        // coroutine-closure, or synthetic MIR body.
+        let mut enclosing_fn_def_id = def_id;
+        while matches!(
+            tcx.def_kind(enclosing_fn_def_id),
+            DefKind::Closure | DefKind::SyntheticCoroutineBody
+        ) {
+            enclosing_fn_def_id = tcx.parent(enclosing_fn_def_id);
+        }
 
         // We look up the generics of the enclosing function and truncate the args
         // to their length in order to cut off extra stuff that might be in there for

tests/ui/async-await/async-closures/debuginfo-by-move-body.rs

@@ -0,0 +1,19 @@
+//@ aux-build:block-on.rs
+//@ edition: 2021
+//@ build-pass
+//@ compile-flags: -Cdebuginfo=2
+
+#![feature(async_closure)]
+
+extern crate block_on;
+
+async fn call_once(f: impl async FnOnce()) {
+    f().await;
+}
+
+pub fn main() {
+    block_on::block_on(async {
+        let async_closure = async move || {};
+        call_once(async_closure).await;
+    });
+}