Fix unwrap, use unwrapDI to cope with nulls

Author: demoitem

llvm/include/llvm-c/DebugInfo.h

@@ -751,9 +751,9 @@ LLVMMetadataRef LLVMDIBuilderCreateSubrangeType(
  * \param Subscripts   Subscripts.
  * \param NumSubscripts Number of subscripts.
  * \param DataLocation DataLocation.
- * \param Associated   Associated (not NULL).
- * \param Allocated    Allocated (not NULL).
- * \param Rank         Rank (not NULL).
+ * \param Associated   Associated.
+ * \param Allocated    Allocated.
+ * \param Rank         Rank.
  * \param BitStride    BitStride.
  */
 LLVMMetadataRef LLVMDIBuilderCreateDynamicArrayType(

llvm/lib/IR/DebugInfo.cpp

@@ -1355,8 +1355,8 @@ LLVMMetadataRef LLVMDIBuilderCreateDynamicArrayType(
   return wrap(unwrap(Builder)->createArrayType(
       unwrapDI<DIScope>(Scope), {Name, NameLen}, unwrapDI<DIFile>(File), LineNo,
       Size, AlignInBits, unwrapDI<DIType>(Ty), Subs,
-      unwrapDI<DIExpression>(DataLocation), unwrap<DIExpression>(Associated),
-      unwrap<DIExpression>(Allocated), unwrap<DIExpression>(Rank),
+      unwrapDI<DIExpression>(DataLocation), unwrapDI<DIExpression>(Associated),
+      unwrapDI<DIExpression>(Allocated), unwrapDI<DIExpression>(Rank),
       unwrap(BitStride)));
 }
 

llvm/tools/llvm-c-test/debuginfo.c

@@ -264,7 +264,7 @@ int llvm_test_dibuilder(void) {
   LLVMMetadataRef L = LLVMDIBuilderCreateExpression(DIB, NULL, 0);
   LLVMMetadataRef DynamicArrayMetadataTy = LLVMDIBuilderCreateDynamicArrayType(
       DIB, File, "foo", 3, 42, File, 64 * 10, 0, Int64Ty, DynSubscripts, 1, L,
-      L, L, L, NULL);
+      NULL, NULL, NULL, NULL);
   LLVMAddNamedMetadataOperand(
       M, "DynType",
       LLVMMetadataAsValue(LLVMGetModuleContext(M), DynamicArrayMetadataTy));