Add file and line metadata for enum variant and fields

Author: mweber15

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

@@ -350,6 +350,7 @@ fn build_single_variant_union_fields<'ll, 'tcx>(
 
     let variant_struct_type_wrapper_di_node = build_variant_struct_wrapper_type_di_node(
         cx,
+        enum_adt_def,
         enum_type_and_layout,
         enum_type_di_node,
         variant_index,
@@ -479,6 +480,7 @@ fn build_variant_names_type_di_node<'ll, 'tcx>(
 
 fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
     cx: &CodegenCx<'ll, 'tcx>,
+    enum_adt_def: AdtDef<'tcx>,
     enum_or_generator_type_and_layout: TyAndLayout<'tcx>,
     enum_or_generator_type_di_node: &'ll DIType,
     variant_index: VariantIdx,
@@ -500,7 +502,7 @@ fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
                 variant_index,
             ),
             &variant_struct_wrapper_type_name(variant_index),
-            None,
+            Some(enum_adt_def.variant(variant_index).def_id),
             // NOTE: We use size and align of enum_type, not from variant_layout:
             size_and_align_of(enum_or_generator_type_and_layout),
             Some(enum_or_generator_type_di_node),
@@ -784,8 +786,13 @@ fn build_union_fields_for_direct_tag_enum_or_generator<'ll, 'tcx>(
         let field_name = variant_union_field_name(variant_member_info.variant_index);
         let (size, align) = size_and_align_of(enum_type_and_layout);
 
+        let ty::Adt(enum_adt_def, _) = enum_type_and_layout.ty.kind() else {
+            unreachable!();
+        };
+
         let variant_struct_type_wrapper = build_variant_struct_wrapper_type_di_node(
             cx,
+            *enum_adt_def,
             enum_type_and_layout,
             enum_type_di_node,
             variant_member_info.variant_index,

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

@@ -265,7 +265,7 @@ fn build_enum_variant_struct_type_di_node<'ll, 'tcx>(
                 variant_index,
             ),
             variant_def.name.as_str(),
-            None,
+            Some(variant_def.def_id),
             // NOTE: We use size and align of enum_type, not from variant_layout:
             size_and_align_of(enum_type_and_layout),
             Some(enum_type_di_node),

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

@@ -5,7 +5,7 @@ use crate::{
     debuginfo::{
         metadata::{
             enums::tag_base_type,
-            file_metadata, size_and_align_of, type_di_node,
+            file_metadata, file_metadata_from_def_id, size_and_align_of, type_di_node,
             type_map::{self, Stub, StubInfo, UniqueTypeId},
             unknown_file_metadata, DINodeCreationResult, SmallVec, NO_GENERICS,
             UNKNOWN_LINE_NUMBER,
@@ -94,14 +94,18 @@ pub(super) fn build_enum_type_di_node<'ll, 'tcx>(
                         enum_adt_def.variant(variant_index),
                         enum_type_and_layout.for_variant(cx, variant_index),
                     ),
-                    source_info: None,
+                    source_info: Some(file_metadata_from_def_id(
+                        cx,
+                        Some(enum_adt_def.variant(variant_index).def_id),
+                    )),
                 })
                 .collect();
 
             smallvec![build_enum_variant_part_di_node(
                 cx,
                 enum_type_and_layout,
                 enum_type_di_node,
+                enum_adt_def.did(),
                 &variant_member_infos[..],
             )]
         },
@@ -209,6 +213,7 @@ pub(super) fn build_generator_di_node<'ll, 'tcx>(
                 cx,
                 generator_type_and_layout,
                 generator_type_di_node,
+                generator_def_id,
                 &variant_struct_type_di_nodes[..],
             )]
         },
@@ -236,6 +241,7 @@ fn build_enum_variant_part_di_node<'ll, 'tcx>(
     cx: &CodegenCx<'ll, 'tcx>,
     enum_type_and_layout: TyAndLayout<'tcx>,
     enum_type_di_node: &'ll DIType,
+    enum_type_def_id: rustc_span::def_id::DefId,
     variant_member_infos: &[VariantMemberInfo<'_, 'll>],
 ) -> &'ll DIType {
     let tag_member_di_node =
@@ -244,6 +250,8 @@ fn build_enum_variant_part_di_node<'ll, 'tcx>(
     let variant_part_unique_type_id =
         UniqueTypeId::for_enum_variant_part(cx.tcx, enum_type_and_layout.ty);
 
+    let (file_metadata, line_number) = file_metadata_from_def_id(cx, Some(enum_type_def_id));
+
     let stub = StubInfo::new(
         cx,
         variant_part_unique_type_id,
@@ -254,8 +262,8 @@ fn build_enum_variant_part_di_node<'ll, 'tcx>(
                 enum_type_di_node,
                 variant_part_name.as_ptr().cast(),
                 variant_part_name.len(),
-                unknown_file_metadata(cx),
-                UNKNOWN_LINE_NUMBER,
+                file_metadata,
+                line_number,
                 enum_type_and_layout.size.bits(),
                 enum_type_and_layout.align.abi.bits() as u32,
                 DIFlags::FlagZero,

compiler/rustc_codegen_llvm/src/debuginfo/metadata/type_map.rs

@@ -20,7 +20,7 @@ use crate::{
     },
 };
 
-use super::{file_metadata, unknown_file_metadata, SmallVec, UNKNOWN_LINE_NUMBER};
+use super::SmallVec;
 
 mod private {
     // This type cannot be constructed outside of this module because
@@ -191,17 +191,7 @@ pub(super) fn stub<'ll, 'tcx>(
     let empty_array = create_DIArray(DIB(cx), &[]);
     let unique_type_id_str = unique_type_id.generate_unique_id_string(cx.tcx);
 
-    let (file_metadata, line_number) = if let Some(def_id) = def_id {
-        let span = cx.tcx.def_span(def_id);
-        if !span.is_dummy() {
-            let loc = cx.lookup_debug_loc(span.lo());
-            (file_metadata(cx, &loc.file), loc.line)
-        } else {
-            (unknown_file_metadata(cx), UNKNOWN_LINE_NUMBER)
-        }
-    } else {
-        (unknown_file_metadata(cx), UNKNOWN_LINE_NUMBER)
-    };
+    let (file_metadata, line_number) = super::file_metadata_from_def_id(cx, def_id);
 
     let metadata = match kind {
         Stub::Struct | Stub::VTableTy { .. } => {

tests/codegen/issue-98678.rs

@@ -6,7 +6,7 @@
 
 // The use of CHECK-DAG here is because the C++-like enum is emitted before the `DIFile` node
 
-// CHECK-DAG: ![[#FILE:]] = !DIFile({{.*}}filename:{{.*}}src/test/codegen/issue-98678.rs{{".*}})
+// CHECK-DAG: ![[#FILE:]] = !DIFile({{.*}}filename:{{.*}}/codegen/issue-98678.rs{{".*}})
 
 // CHECK-DAG: !DICompositeType({{.*"}}MyCppLikeEnum{{".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 2]],
 #[repr(C)]
@@ -28,8 +28,10 @@ pub union MyUnion {
     f: f32,
 }
 
-// CHECK: !DICompositeType({{.*"}}MyNativeEnum{{".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 1]],
+// CHECK: !DICompositeType({{.*"}}MyNativeEnum{{".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 2]],
+// CHECK: !DICompositeType({{.*}}DW_TAG_variant_part{{.*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 1]],
 pub enum MyNativeEnum {
+    // CHECK: !DIDerivedType({{.*"}}One{{".*}}file: ![[#FILE]]{{.*}}line: [[# @LINE + 1]],
     One,
 }