use LLVMDIBuilderGetOrCreateTypeArray from c api. Arguments type changed

Author: klensy

compiler/rustc_codegen_llvm/src/debuginfo/utils.rs

@@ -1,5 +1,6 @@
 // Utility Functions.
 
+use libc::size_t;
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::layout::{HasTypingEnv, LayoutOf};
 use rustc_middle::ty::{self, Ty};
@@ -28,7 +29,7 @@ pub(crate) fn create_DIArray<'ll>(
     builder: &DIBuilder<'ll>,
     arr: &[Option<&'ll DIDescriptor>],
 ) -> &'ll DIArray {
-    unsafe { llvm::LLVMRustDIBuilderGetOrCreateArray(builder, arr.as_ptr(), arr.len() as u32) }
+    unsafe { llvm::LLVMDIBuilderGetOrCreateTypeArray(builder, arr.as_ptr(), arr.len() as size_t) }
 }
 
 #[inline]

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1846,6 +1846,12 @@ unsafe extern "C" {
         Name: *const c_char,
         NameLen: size_t,
     ) -> &'ll DIDerivedType;
+
+    pub(crate) fn LLVMDIBuilderGetOrCreateTypeArray<'ll>(
+        Builder: &DIBuilder<'ll>,
+        Data: *const Option<&'ll DIDescriptor>, //FIXME: is it really const?
+        Length: size_t,
+    ) -> &'ll DIArray;
 }
 
 #[link(name = "llvm-wrapper", kind = "static")]
@@ -2310,12 +2316,6 @@ unsafe extern "C" {
         Count: i64,
     ) -> &'a DISubrange;
 
-    pub(crate) fn LLVMRustDIBuilderGetOrCreateArray<'a>(
-        Builder: &DIBuilder<'a>,
-        Ptr: *const Option<&'a DIDescriptor>,
-        Count: c_uint,
-    ) -> &'a DIArray;
-
     pub(crate) fn LLVMRustDIBuilderInsertDeclareAtEnd<'a>(
         Builder: &DIBuilder<'a>,
         Val: &'a Value,

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -1204,15 +1204,6 @@ LLVMRustDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, int64_t Lo,
   return wrap(unwrap(Builder)->getOrCreateSubrange(Lo, Count));
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderGetOrCreateArray(LLVMDIBuilderRef Builder,
-                                  LLVMMetadataRef *Ptr, unsigned Count) {
-  Metadata **DataValue = unwrap(Ptr);
-  return wrap(unwrap(Builder)
-                  ->getOrCreateArray(ArrayRef<Metadata *>(DataValue, Count))
-                  .get());
-}
-
 extern "C" void
 LLVMRustDIBuilderInsertDeclareAtEnd(LLVMDIBuilderRef Builder, LLVMValueRef V,
                                     LLVMMetadataRef VarInfo, uint64_t *AddrOps,