Use LLVMDIBuilderCreateArrayType

Author: Zalathar

compiler/rustc_codegen_llvm/src/debuginfo/di_builder.rs

@@ -54,4 +54,23 @@ impl<'ll> DIBuilder<'ll> {
             )
         }
     }
+
+    pub(crate) fn create_array_type(
+        &self,
+        size: Size,
+        align: Align,
+        element_type: &'ll Metadata,
+        subscripts: &[&'ll Metadata],
+    ) -> &'ll Metadata {
+        unsafe {
+            llvm::LLVMDIBuilderCreateArrayType(
+                self,
+                size.bits(),
+                align.bits() as u32,
+                element_type,
+                subscripts.as_ptr(),
+                subscripts.len() as c_uint,
+            )
+        }
+    }
 }

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

@@ -27,9 +27,7 @@ use self::type_map::{DINodeCreationResult, Stub, UniqueTypeId};
 use super::CodegenUnitDebugContext;
 use super::namespace::mangled_name_of_instance;
 use super::type_names::{compute_debuginfo_type_name, compute_debuginfo_vtable_name};
-use super::utils::{
-    DIB, create_DIArray, debug_context, get_namespace_for_item, is_node_local_to_unit,
-};
+use super::utils::{DIB, debug_context, get_namespace_for_item, is_node_local_to_unit};
 use crate::common::{AsCCharPtr, CodegenCx};
 use crate::debuginfo::dwarf_const;
 use crate::debuginfo::metadata::type_map::build_type_with_children;
@@ -112,19 +110,9 @@ fn build_fixed_size_array_di_node<'ll, 'tcx>(
         .try_to_target_usize(cx.tcx)
         .expect("expected monomorphic const in codegen") as c_longlong;
 
-    let subrange =
-        unsafe { Some(llvm::LLVMRustDIBuilderGetOrCreateSubrange(DIB(cx), 0, upper_bound)) };
+    let subrange = unsafe { llvm::LLVMRustDIBuilderGetOrCreateSubrange(DIB(cx), 0, upper_bound) };
 
-    let subscripts = create_DIArray(DIB(cx), &[subrange]);
-    let di_node = unsafe {
-        llvm::LLVMRustDIBuilderCreateArrayType(
-            DIB(cx),
-            size.bits(),
-            align.bits() as u32,
-            element_type_di_node,
-            subscripts,
-        )
-    };
+    let di_node = DIB(cx).create_array_type(size, align, element_type_di_node, &[subrange]);
 
     DINodeCreationResult::new(di_node, false)
 }

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1792,6 +1792,15 @@ unsafe extern "C" {
         UniqueId: *const c_uchar,
         UniqueIdLen: size_t,
     ) -> &'ll Metadata;
+
+    pub(crate) fn LLVMDIBuilderCreateArrayType<'ll>(
+        Builder: &DIBuilder<'ll>,
+        Size: u64,
+        AlignInBits: u32,
+        Ty: &'ll Metadata,
+        Subscripts: *const &'ll Metadata,
+        NumSubscripts: c_uint,
+    ) -> &'ll Metadata;
 }
 
 #[link(name = "llvm-wrapper", kind = "static")]
@@ -2249,14 +2258,6 @@ unsafe extern "C" {
         AlignInBits: u32,
     ) -> &'a DIVariable;
 
-    pub fn LLVMRustDIBuilderCreateArrayType<'a>(
-        Builder: &DIBuilder<'a>,
-        Size: u64,
-        AlignInBits: u32,
-        Ty: &'a DIType,
-        Subscripts: &'a DIArray,
-    ) -> &'a DIType;
-
     pub fn LLVMRustDIBuilderGetOrCreateSubrange<'a>(
         Builder: &DIBuilder<'a>,
         Lo: i64,

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -1221,15 +1221,6 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariable(
   }
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateArrayType(LLVMDIBuilderRef Builder, uint64_t Size,
-                                 uint32_t AlignInBits, LLVMMetadataRef Ty,
-                                 LLVMMetadataRef Subscripts) {
-  return wrap(unwrap(Builder)->createArrayType(
-      Size, AlignInBits, unwrapDI<DIType>(Ty),
-      DINodeArray(unwrapDI<MDTuple>(Subscripts))));
-}
-
 extern "C" LLVMMetadataRef
 LLVMRustDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, int64_t Lo,
                                      int64_t Count) {