Add file and line metadata for generators

Author: mweber15

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs

@@ -277,6 +277,9 @@ pub(super) fn build_generator_di_node<'ll, 'tcx>(
     unique_type_id: UniqueTypeId<'tcx>,
 ) -> DINodeCreationResult<'ll> {
     let generator_type = unique_type_id.expect_ty();
+    let &ty::Generator(generator_def_id, _, _ ) = generator_type.kind() else {
+        bug!("build_generator_di_node() called with non-generator type: `{:?}`", generator_type)
+        };
     let generator_type_and_layout = cx.layout_of(generator_type);
     let generator_type_name = compute_debuginfo_type_name(cx.tcx, generator_type, false);
 
@@ -289,7 +292,7 @@ pub(super) fn build_generator_di_node<'ll, 'tcx>(
             type_map::Stub::Union,
             unique_type_id,
             &generator_type_name,
-            None,
+            Some(generator_def_id),
             size_and_align_of(generator_type_and_layout),
             NO_SCOPE_METADATA,
             DIFlags::FlagZero,

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/native.rs

@@ -151,7 +151,7 @@ pub(super) fn build_generator_di_node<'ll, 'tcx>(
             Stub::Struct,
             unique_type_id,
             &generator_type_name,
-            None,
+            Some(generator_def_id),
             size_and_align_of(generator_type_and_layout),
             Some(containing_scope),
             DIFlags::FlagZero,

tests/codegen/issue-98678.rs

@@ -2,6 +2,7 @@
 //
 // compile-flags: -C debuginfo=2
 #![crate_type = "lib"]
+#![feature(generators)]
 
 // The use of CHECK-DAG here is because the C++-like enum is emitted before the `DIFile` node
 
@@ -31,4 +32,7 @@ pub fn foo(_: MyType, _: MyUnion, _: MyNativeEnum, _: MyCppLikeEnum) {
     // CHECK: !DICompositeType({{.*"[{]}}closure_env#0{{[}]".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 1]],
     let closure = |x| x;
     closure(0);
+
+    // CHECK: !DICompositeType({{.*"[{]}}generator_env#1{{[}]".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 1]],
+    let generator = || yield 1;
 }