use LLVMDIBuilderCreateQualifiedType from llvm c api

Author: klensy

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

@@ -567,39 +567,37 @@ fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
                 None,
             ));
 
-            let build_assoc_const = |name: &str,
-                                     type_di_node_: &'ll DIType,
-                                     value: u64,
-                                     align: Align| unsafe {
-                // FIXME: Currently we force all DISCR_* values to be u64's as LLDB seems to have
-                // problems inspecting other value types. Since DISCR_* is typically only going to be
-                // directly inspected via the debugger visualizer - which compares it to the `tag` value
-                // (whose type is not modified at all) it shouldn't cause any real problems.
-                let (t_di, align) = if name == ASSOC_CONST_DISCR_NAME {
-                    (type_di_node_, align.bits() as u32)
-                } else {
-                    let ty_u64 = Ty::new_uint(cx.tcx, ty::UintTy::U64);
-                    (type_di_node(cx, ty_u64), Align::EIGHT.bits() as u32)
+            let build_assoc_const =
+                |name: &str, type_di_node_: &'ll DIType, value: u64, align: Align| unsafe {
+                    // FIXME: Currently we force all DISCR_* values to be u64's as LLDB seems to have
+                    // problems inspecting other value types. Since DISCR_* is typically only going to be
+                    // directly inspected via the debugger visualizer - which compares it to the `tag` value
+                    // (whose type is not modified at all) it shouldn't cause any real problems.
+                    let (t_di, align) = if name == ASSOC_CONST_DISCR_NAME {
+                        (type_di_node_, align.bits() as u32)
+                    } else {
+                        let ty_u64 = Ty::new_uint(cx.tcx, ty::UintTy::U64);
+                        (type_di_node(cx, ty_u64), Align::EIGHT.bits() as u32)
+                    };
+
+                    // must wrap type in a `const` modifier for LLDB to be able to inspect the value of the member
+                    let field_type =
+                        llvm::LLVMDIBuilderCreateQualifiedType(DIB(cx), DW_TAG_const_type, t_di);
+
+                    llvm::LLVMRustDIBuilderCreateStaticMemberType(
+                        DIB(cx),
+                        wrapper_struct_type_di_node,
+                        name.as_c_char_ptr(),
+                        name.len(),
+                        unknown_file_metadata(cx),
+                        UNKNOWN_LINE_NUMBER,
+                        field_type,
+                        DIFlags::FlagZero,
+                        Some(cx.const_u64(value)),
+                        align,
+                    )
                 };
 
-                // must wrap type in a `const` modifier for LLDB to be able to inspect the value of the member
-                let field_type =
-                    llvm::LLVMRustDIBuilderCreateQualifiedType(DIB(cx), DW_TAG_const_type, t_di);
-
-                llvm::LLVMRustDIBuilderCreateStaticMemberType(
-                    DIB(cx),
-                    wrapper_struct_type_di_node,
-                    name.as_c_char_ptr(),
-                    name.len(),
-                    unknown_file_metadata(cx),
-                    UNKNOWN_LINE_NUMBER,
-                    field_type,
-                    DIFlags::FlagZero,
-                    Some(cx.const_u64(value)),
-                    align,
-                )
-            };
-
             // We also always have an associated constant for the discriminant value
             // of the variant.
             fields.push(build_assoc_const(

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1830,6 +1830,12 @@ unsafe extern "C" {
         Scope: &'ll Metadata,
         InlinedAt: Option<&'ll Metadata>,
     ) -> &'ll Metadata;
+
+    pub(crate) fn LLVMDIBuilderCreateQualifiedType<'ll>(
+        Builder: &DIBuilder<'ll>,
+        Tag: c_uint,
+        Type: &'ll DIType,
+    ) -> &'ll DIDerivedType;
 }
 
 #[link(name = "llvm-wrapper", kind = "static")]
@@ -2259,12 +2265,6 @@ unsafe extern "C" {
         AlignInBits: u32,
     ) -> &'a DIDerivedType;
 
-    pub(crate) fn LLVMRustDIBuilderCreateQualifiedType<'a>(
-        Builder: &DIBuilder<'a>,
-        Tag: c_uint,
-        Type: &'a DIType,
-    ) -> &'a DIDerivedType;
-
     pub(crate) fn LLVMRustDIBuilderCreateStaticVariable<'a>(
         Builder: &DIBuilder<'a>,
         Context: Option<&'a DIScope>,

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -1149,13 +1149,6 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticMemberType(
       unwrap<llvm::ConstantInt>(val), llvm::dwarf::DW_TAG_member, AlignInBits));
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateQualifiedType(LLVMDIBuilderRef Builder, unsigned Tag,
-                                     LLVMMetadataRef Type) {
-  return wrap(
-      unwrap(Builder)->createQualifiedType(Tag, unwrapDI<DIType>(Type)));
-}
-
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Context, const char *Name,
     size_t NameLen, const char *LinkageName, size_t LinkageNameLen,