Add support for creating a SetType, a Subrangetype, a dynamic array type

and for replacing arrays to the C inteface

Author: demoitem

llvm/include/llvm-c/DebugInfo.h

@@ -690,15 +690,15 @@ LLVMDIBuilderCreateArrayType(LLVMDIBuilderRef Builder, uint64_t Size,
 
 /**
  * Create debugging information entry for a set.
- * @param Builder        The DIBuilder.
- * \param Scope          The scope this module is imported into.
+ * \param Builder        The DIBuilder.
+ * \param Scope          The scope in which the set is defined.
  * \param Name           A name that uniquely identifies this set.
  * \param NameLen        The length of the C string passed to \c Name.
  * \param File           File where the set is located.
  * \param Line           Line number of the declaration.
  * \param SizeInBits     Set size.
  * \param AlignInBits    Set alignment.
- * @param BaseTy         The base type of the set.
+ * \param BaseTy         The base type of the set.
  */
 LLVMMetadataRef LLVMDIBuilderCreateSetType(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
@@ -708,8 +708,8 @@ LLVMMetadataRef LLVMDIBuilderCreateSetType(
 /**
  * Create a descriptor for a subrange with dynamic bounds.
  * \param Builder    The DIBuilder.
- * \param Scope      The scope this module is imported into.
- * \param Name       A name that uniquely identifies this set.
+ * \param Scope      The scope in which the subrange is defined.
+ * \param Name       A name that uniquely identifies this subrange.
  * \param NameLen    The length of the C string passed to \c Name.
  * \param LineNo     Line number.
  * \param File       File where the subrange is located.
@@ -724,9 +724,8 @@ LLVMMetadataRef LLVMDIBuilderCreateSetType(
  */
 LLVMMetadataRef LLVMDIBuilderCreateSubrangeType(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
-    size_t NameLen, unsigned LineNo, LLVMMetadataRef File,
-    uint64_t SizeInBits, uint32_t AlignInBits,
-    LLVMDIFlags Flags, LLVMMetadataRef BaseTy,
+    size_t NameLen, unsigned LineNo, LLVMMetadataRef File, uint64_t SizeInBits,
+    uint32_t AlignInBits, LLVMDIFlags Flags, LLVMMetadataRef BaseTy,
     LLVMMetadataRef LowerBound, LLVMMetadataRef UpperBound,
     LLVMMetadataRef Stride, LLVMMetadataRef Bias);
 
@@ -746,11 +745,11 @@ LLVMMetadataRef LLVMDIBuilderCreateSubrangeType(
  */
 LLVMMetadataRef LLVMDIBuilderCreateDynamicArrayType(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
-    size_t NameLen, unsigned LineNo, LLVMMetadataRef File,
-    uint64_t Size, uint32_t AlignInBits,
-    LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts,
-    LLVMMetadataRef DataLocation, LLVMMetadataRef Associated,
-    LLVMMetadataRef Allocated, LLVMMetadataRef Rank, LLVMMetadataRef BitStride);
+    size_t NameLen, unsigned LineNo, LLVMMetadataRef File, uint64_t Size,
+    uint32_t AlignInBits, LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts,
+    unsigned NumSubscripts, LLVMMetadataRef DataLocation,
+    LLVMMetadataRef Associated, LLVMMetadataRef Allocated, LLVMMetadataRef Rank,
+    LLVMMetadataRef BitStride);
 
 /**
  * Replace arrays.

llvm/lib/IR/DebugInfo.cpp

@@ -1320,32 +1320,29 @@ LLVMMetadataRef LLVMDIBuilderCreateSetType(
 
 LLVMMetadataRef LLVMDIBuilderCreateSubrangeType(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
-    size_t NameLen, unsigned LineNo, LLVMMetadataRef File,
-    uint64_t SizeInBits, uint32_t AlignInBits,
-    LLVMDIFlags Flags, LLVMMetadataRef BaseTy,
+    size_t NameLen, unsigned LineNo, LLVMMetadataRef File, uint64_t SizeInBits,
+    uint32_t AlignInBits, LLVMDIFlags Flags, LLVMMetadataRef BaseTy,
     LLVMMetadataRef LowerBound, LLVMMetadataRef UpperBound,
-    LLVMMetadataRef Stride, LLVMMetadataRef Bias
-    ) {
+    LLVMMetadataRef Stride, LLVMMetadataRef Bias) {
   return wrap(unwrap(Builder)->createSubrangeType(
-	  {Name, NameLen}, unwrapDI<DIFile>(File), LineNo,
-	  unwrapDI<DIScope>(Scope), SizeInBits, AlignInBits,
-	  map_from_llvmDIFlags(Flags), unwrapDI<DIType>(BaseTy),
-          unwrap<DIExpression>(LowerBound), unwrap<DIExpression>(UpperBound),
-          unwrap<DIExpression>(Stride), unwrap<DIExpression>(Bias)));
+      {Name, NameLen}, unwrapDI<DIFile>(File), LineNo, unwrapDI<DIScope>(Scope),
+      SizeInBits, AlignInBits, map_from_llvmDIFlags(Flags),
+      unwrapDI<DIType>(BaseTy), unwrap<DIExpression>(LowerBound),
+      unwrap<DIExpression>(UpperBound), unwrap<DIExpression>(Stride),
+      unwrap<DIExpression>(Bias)));
 }
 
 LLVMMetadataRef LLVMDIBuilderCreateDynamicArrayType(
     LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
-    size_t NameLen, unsigned LineNo, LLVMMetadataRef File,
-    uint64_t Size, uint32_t AlignInBits,
-    LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts,
-    LLVMMetadataRef DataLocation, LLVMMetadataRef Associated,
-    LLVMMetadataRef Allocated, LLVMMetadataRef Rank, LLVMMetadataRef BitStride) {
+    size_t NameLen, unsigned LineNo, LLVMMetadataRef File, uint64_t Size,
+    uint32_t AlignInBits, LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts,
+    unsigned NumSubscripts, LLVMMetadataRef DataLocation,
+    LLVMMetadataRef Associated, LLVMMetadataRef Allocated, LLVMMetadataRef Rank,
+    LLVMMetadataRef BitStride) {
   auto Subs =
       unwrap(Builder)->getOrCreateArray({unwrap(Subscripts), NumSubscripts});
   return wrap(unwrap(Builder)->createArrayType(
-      unwrapDI<DIScope>(Scope),
-      {Name, NameLen}, unwrapDI<DIFile>(File), LineNo,
+      unwrapDI<DIScope>(Scope), {Name, NameLen}, unwrapDI<DIFile>(File), LineNo,
       Size, AlignInBits, unwrapDI<DIType>(Ty), Subs,
       unwrap<DIExpression>(DataLocation), unwrap<DIExpression>(Associated),
       unwrap<DIExpression>(Allocated), unwrap<DIExpression>(Rank),
@@ -1355,8 +1352,8 @@ LLVMMetadataRef LLVMDIBuilderCreateDynamicArrayType(
 void LLVMReplaceArrays(LLVMDIBuilderRef Builder, LLVMMetadataRef *T,
                        LLVMMetadataRef *Elements, unsigned NumElements) {
   auto Arr = unwrap<DICompositeType>(*T);
-  auto Elts = unwrap(Builder)->getOrCreateArray({unwrap(Elements),
-		                                 NumElements});
+  auto Elts =
+      unwrap(Builder)->getOrCreateArray({unwrap(Elements), NumElements});
   unwrap(Builder)->replaceArrays(Arr, Elts);
 }