diff --git a/llvm/include/llvm-c/DebugInfo.h b/llvm/include/llvm-c/DebugInfo.h --- a/llvm/include/llvm-c/DebugInfo.h +++ b/llvm/include/llvm-c/DebugInfo.h @@ -224,7 +224,7 @@ /** * Construct any deferred debug info descriptors. */ -void LLVMDIBuilderFinalize(LLVMDIBuilderRef Builder); +void llvmDIBuilderFinalize(LLVMDIBuilderRef Builder); /** * A CompileUnit provides an anchor for all debugging @@ -258,7 +258,7 @@ * \param SDK The SDK. On Darwin, the last component of the sysroot. * \param SDKLen The length of the C string passed to \c SDK. */ -LLVMMetadataRef LLVMDIBuilderCreateCompileUnit( +LLVMMetadataRef llvmDIBuilderCreateCompileUnit( LLVMDIBuilderRef Builder, LLVMDWARFSourceLanguage Lang, LLVMMetadataRef FileRef, const char *Producer, size_t ProducerLen, LLVMBool isOptimized, const char *Flags, size_t FlagsLen, @@ -275,10 +275,11 @@ * \param Directory Directory. * \param DirectoryLen The length of the C string passed to \c Directory. */ -LLVMMetadataRef -LLVMDIBuilderCreateFile(LLVMDIBuilderRef Builder, const char *Filename, - size_t FilenameLen, const char *Directory, - size_t DirectoryLen); +LLVMMetadataRef llvmDIBuilderCreateFile(LLVMDIBuilderRef Builder, + const char *Filename, + size_t FilenameLen, + const char *Directory, + size_t DirectoryLen); /** * Creates a new descriptor for a module with the specified parent scope. @@ -295,7 +296,7 @@ * \param APINotesFileLen The length of the C string passed to \c APINotestFile. */ LLVMMetadataRef -LLVMDIBuilderCreateModule(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentScope, +llvmDIBuilderCreateModule(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentScope, const char *Name, size_t NameLen, const char *ConfigMacros, size_t ConfigMacrosLen, const char *IncludePath, size_t IncludePathLen, @@ -310,11 +311,10 @@ * \param ExportSymbols Whether or not the namespace exports symbols, e.g. * this is true of C++ inline namespaces. */ -LLVMMetadataRef -LLVMDIBuilderCreateNameSpace(LLVMDIBuilderRef Builder, - LLVMMetadataRef ParentScope, - const char *Name, size_t NameLen, - LLVMBool ExportSymbols); +LLVMMetadataRef llvmDIBuilderCreateNameSpace(LLVMDIBuilderRef Builder, + LLVMMetadataRef ParentScope, + const char *Name, size_t NameLen, + LLVMBool ExportSymbols); /** * Create a new descriptor for the specified subprogram. @@ -334,12 +334,12 @@ * used to emit dwarf attributes. * \param IsOptimized True if optimization is ON. */ -LLVMMetadataRef LLVMDIBuilderCreateFunction( +LLVMMetadataRef llvmDIBuilderCreateFunction( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *LinkageName, size_t LinkageNameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, - LLVMBool IsLocalToUnit, LLVMBool IsDefinition, - unsigned ScopeLine, LLVMDIFlags Flags, LLVMBool IsOptimized); + LLVMBool IsLocalToUnit, LLVMBool IsDefinition, unsigned ScopeLine, + LLVMDIFlags Flags, LLVMBool IsOptimized); /** * Create a descriptor for a lexical block with the specified parent context. @@ -349,9 +349,10 @@ * \param Line The line in the source file. * \param Column The column in the source file. */ -LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock( - LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, - LLVMMetadataRef File, unsigned Line, unsigned Column); +LLVMMetadataRef llvmDIBuilderCreateLexicalBlock(LLVMDIBuilderRef Builder, + LLVMMetadataRef Scope, + LLVMMetadataRef File, + unsigned Line, unsigned Column); /** * Create a descriptor for a lexical block with a new file attached. @@ -360,11 +361,10 @@ * \param File Source file. * \param Discriminator DWARF path discriminator value. */ -LLVMMetadataRef -LLVMDIBuilderCreateLexicalBlockFile(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef File, - unsigned Discriminator); +LLVMMetadataRef llvmDIBuilderCreateLexicalBlockFile(LLVMDIBuilderRef Builder, + LLVMMetadataRef Scope, + LLVMMetadataRef File, + unsigned Discriminator); /** * Create a descriptor for an imported namespace. Suitable for e.g. C++ @@ -374,12 +374,9 @@ * \param File File where the declaration is located. * \param Line Line number of the declaration. */ -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromNamespace(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef NS, - LLVMMetadataRef File, - unsigned Line); +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromNamespace( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef NS, + LLVMMetadataRef File, unsigned Line); /** * Create a descriptor for an imported module that aliases another @@ -390,12 +387,9 @@ * \param File File where the declaration is located. * \param Line Line number of the declaration. */ -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromAlias(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef ImportedEntity, - LLVMMetadataRef File, - unsigned Line); +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromAlias( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, + LLVMMetadataRef ImportedEntity, LLVMMetadataRef File, unsigned Line); /** * Create a descriptor for an imported module. @@ -405,12 +399,9 @@ * \param File File where the declaration is located. * \param Line Line number of the declaration. */ -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromModule(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef M, - LLVMMetadataRef File, - unsigned Line); +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromModule( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef M, + LLVMMetadataRef File, unsigned Line); /** * Create a descriptor for an imported function, type, or variable. Suitable @@ -424,13 +415,9 @@ * \param Name A name that uniquely identifies this imported declaration. * \param NameLen The length of the C string passed to \c Name. */ -LLVMMetadataRef -LLVMDIBuilderCreateImportedDeclaration(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef Decl, - LLVMMetadataRef File, - unsigned Line, - const char *Name, size_t NameLen); +LLVMMetadataRef llvmDIBuilderCreateImportedDeclaration( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef Decl, + LLVMMetadataRef File, unsigned Line, const char *Name, size_t NameLen); /** * Creates a new DebugLocation that describes a source location. @@ -442,10 +429,10 @@ * \note If the item to which this location is attached cannot be * attributed to a source line, pass 0 for the line and column. */ -LLVMMetadataRef -LLVMDIBuilderCreateDebugLocation(LLVMContextRef Ctx, unsigned Line, - unsigned Column, LLVMMetadataRef Scope, - LLVMMetadataRef InlinedAt); +LLVMMetadataRef llvmDIBuilderCreateDebugLocation(LLVMContextRef Ctx, + unsigned Line, unsigned Column, + LLVMMetadataRef Scope, + LLVMMetadataRef InlinedAt); /** * Get the line number of this debug location. @@ -520,7 +507,7 @@ * \param Data The type elements. * \param NumElements Number of type elements. */ -LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateTypeArray(LLVMDIBuilderRef Builder, LLVMMetadataRef *Data, size_t NumElements); @@ -534,12 +521,10 @@ * \param Flags E.g.: \c LLVMDIFlagLValueReference. * These flags are used to emit dwarf attributes. */ -LLVMMetadataRef -LLVMDIBuilderCreateSubroutineType(LLVMDIBuilderRef Builder, - LLVMMetadataRef File, - LLVMMetadataRef *ParameterTypes, - unsigned NumParameterTypes, - LLVMDIFlags Flags); +LLVMMetadataRef llvmDIBuilderCreateSubroutineType( + LLVMDIBuilderRef Builder, LLVMMetadataRef File, + LLVMMetadataRef *ParameterTypes, unsigned NumParameterTypes, + LLVMDIFlags Flags); /** * Create debugging information entry for a macro. @@ -552,7 +537,7 @@ * @param Value Macro value. * @param ValueLen Macro value length. */ -LLVMMetadataRef LLVMDIBuilderCreateMacro(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateMacro(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentMacroFile, unsigned Line, LLVMDWARFMacinfoRecordType RecordType, @@ -569,7 +554,7 @@ * @param File File descriptor containing the name of the macro file. */ LLVMMetadataRef -LLVMDIBuilderCreateTempMacroFile(LLVMDIBuilderRef Builder, +llvmDIBuilderCreateTempMacroFile(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentMacroFile, unsigned Line, LLVMMetadataRef File); @@ -581,7 +566,7 @@ * @param Value Enumerator value. * @param IsUnsigned True if the value is unsigned. */ -LLVMMetadataRef LLVMDIBuilderCreateEnumerator(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateEnumerator(LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, int64_t Value, LLVMBool IsUnsigned); @@ -600,7 +585,7 @@ * \param NumElements Number of enumeration elements. * \param ClassTy Underlying type of a C++11/ObjC fixed enum. */ -LLVMMetadataRef LLVMDIBuilderCreateEnumerationType( +LLVMMetadataRef llvmDIBuilderCreateEnumerationType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, uint32_t AlignInBits, LLVMMetadataRef *Elements, @@ -623,14 +608,13 @@ * \param UniqueId A unique identifier for the union. * \param UniqueIdLen Length of unique identifier. */ -LLVMMetadataRef LLVMDIBuilderCreateUnionType( +LLVMMetadataRef llvmDIBuilderCreateUnionType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, LLVMMetadataRef *Elements, unsigned NumElements, unsigned RunTimeLang, const char *UniqueId, size_t UniqueIdLen); - /** * Create debugging information entry for an array. * \param Builder The DIBuilder. @@ -640,11 +624,9 @@ * \param Subscripts Subscripts. * \param NumSubscripts Number of subscripts. */ -LLVMMetadataRef -LLVMDIBuilderCreateArrayType(LLVMDIBuilderRef Builder, uint64_t Size, - uint32_t AlignInBits, LLVMMetadataRef Ty, - LLVMMetadataRef *Subscripts, - unsigned NumSubscripts); +LLVMMetadataRef llvmDIBuilderCreateArrayType( + LLVMDIBuilderRef Builder, uint64_t Size, uint32_t AlignInBits, + LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts); /** * Create debugging information entry for a vector type. @@ -655,11 +637,9 @@ * \param Subscripts Subscripts. * \param NumSubscripts Number of subscripts. */ -LLVMMetadataRef -LLVMDIBuilderCreateVectorType(LLVMDIBuilderRef Builder, uint64_t Size, - uint32_t AlignInBits, LLVMMetadataRef Ty, - LLVMMetadataRef *Subscripts, - unsigned NumSubscripts); +LLVMMetadataRef llvmDIBuilderCreateVectorType( + LLVMDIBuilderRef Builder, uint64_t Size, uint32_t AlignInBits, + LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts); /** * Create a DWARF unspecified type. @@ -667,9 +647,9 @@ * \param Name The unspecified type's name. * \param NameLen Length of type name. */ -LLVMMetadataRef -LLVMDIBuilderCreateUnspecifiedType(LLVMDIBuilderRef Builder, const char *Name, - size_t NameLen); +LLVMMetadataRef llvmDIBuilderCreateUnspecifiedType(LLVMDIBuilderRef Builder, + const char *Name, + size_t NameLen); /** * Create debugging information entry for a basic @@ -681,11 +661,11 @@ * \param Encoding DWARF encoding code, e.g. \c LLVMDWARFTypeEncoding_float. * \param Flags Flags to encode optional attribute like endianity */ -LLVMMetadataRef -LLVMDIBuilderCreateBasicType(LLVMDIBuilderRef Builder, const char *Name, - size_t NameLen, uint64_t SizeInBits, - LLVMDWARFTypeEncoding Encoding, - LLVMDIFlags Flags); +LLVMMetadataRef llvmDIBuilderCreateBasicType(LLVMDIBuilderRef Builder, + const char *Name, size_t NameLen, + uint64_t SizeInBits, + LLVMDWARFTypeEncoding Encoding, + LLVMDIFlags Flags); /** * Create debugging information entry for a pointer. @@ -697,10 +677,11 @@ * \param Name Pointer type name. (optional) * \param NameLen Length of pointer type name. (optional) */ -LLVMMetadataRef LLVMDIBuilderCreatePointerType( - LLVMDIBuilderRef Builder, LLVMMetadataRef PointeeTy, - uint64_t SizeInBits, uint32_t AlignInBits, unsigned AddressSpace, - const char *Name, size_t NameLen); +LLVMMetadataRef +llvmDIBuilderCreatePointerType(LLVMDIBuilderRef Builder, + LLVMMetadataRef PointeeTy, uint64_t SizeInBits, + uint32_t AlignInBits, unsigned AddressSpace, + const char *Name, size_t NameLen); /** * Create debugging information entry for a struct. @@ -720,7 +701,7 @@ * \param UniqueId A unique identifier for the struct. * \param UniqueIdLen Length of the unique identifier for the struct. */ -LLVMMetadataRef LLVMDIBuilderCreateStructType( +LLVMMetadataRef llvmDIBuilderCreateStructType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, @@ -742,11 +723,11 @@ * \param Flags Flags to encode member attribute, e.g. private * \param Ty Parent type. */ -LLVMMetadataRef LLVMDIBuilderCreateMemberType( +LLVMMetadataRef llvmDIBuilderCreateMemberType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, - size_t NameLen, LLVMMetadataRef File, unsigned LineNo, - uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, - LLVMDIFlags Flags, LLVMMetadataRef Ty); + size_t NameLen, LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits, + uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, + LLVMMetadataRef Ty); /** * Create debugging information entry for a @@ -762,8 +743,7 @@ * \param ConstantVal Const initializer of the member. * \param AlignInBits Member alignment. */ -LLVMMetadataRef -LLVMDIBuilderCreateStaticMemberType( +LLVMMetadataRef llvmDIBuilderCreateStaticMemberType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, LLVMMetadataRef Type, LLVMDIFlags Flags, LLVMValueRef ConstantVal, @@ -778,13 +758,10 @@ * \param AlignInBits Alignment. * \param Flags Flags. */ -LLVMMetadataRef -LLVMDIBuilderCreateMemberPointerType(LLVMDIBuilderRef Builder, - LLVMMetadataRef PointeeType, - LLVMMetadataRef ClassType, - uint64_t SizeInBits, - uint32_t AlignInBits, - LLVMDIFlags Flags); +LLVMMetadataRef llvmDIBuilderCreateMemberPointerType( + LLVMDIBuilderRef Builder, LLVMMetadataRef PointeeType, + LLVMMetadataRef ClassType, uint64_t SizeInBits, uint32_t AlignInBits, + LLVMDIFlags Flags); /** * Create debugging information entry for Objective-C instance variable. * \param Builder The DIBuilder. @@ -799,13 +776,11 @@ * \param Ty Parent type. * \param PropertyNode Property associated with this ivar. */ -LLVMMetadataRef -LLVMDIBuilderCreateObjCIVar(LLVMDIBuilderRef Builder, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNo, - uint64_t SizeInBits, uint32_t AlignInBits, - uint64_t OffsetInBits, LLVMDIFlags Flags, - LLVMMetadataRef Ty, LLVMMetadataRef PropertyNode); +LLVMMetadataRef llvmDIBuilderCreateObjCIVar( + LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, + LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits, + uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, + LLVMMetadataRef Ty, LLVMMetadataRef PropertyNode); /** * Create debugging information entry for Objective-C property. @@ -821,23 +796,19 @@ * \param PropertyAttributes Objective C property attributes. * \param Ty Type. */ -LLVMMetadataRef -LLVMDIBuilderCreateObjCProperty(LLVMDIBuilderRef Builder, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNo, - const char *GetterName, size_t GetterNameLen, - const char *SetterName, size_t SetterNameLen, - unsigned PropertyAttributes, - LLVMMetadataRef Ty); +LLVMMetadataRef llvmDIBuilderCreateObjCProperty( + LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, + LLVMMetadataRef File, unsigned LineNo, const char *GetterName, + size_t GetterNameLen, const char *SetterName, size_t SetterNameLen, + unsigned PropertyAttributes, LLVMMetadataRef Ty); /** * Create a uniqued DIType* clone with FlagObjectPointer and FlagArtificial set. * \param Builder The DIBuilder. * \param Type The underlying type to which this pointer points. */ -LLVMMetadataRef -LLVMDIBuilderCreateObjectPointerType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Type); +LLVMMetadataRef llvmDIBuilderCreateObjectPointerType(LLVMDIBuilderRef Builder, + LLVMMetadataRef Type); /** * Create debugging information entry for a qualified @@ -847,9 +818,9 @@ * e.g. LLVMDWARFTypeQualifier_volatile_type * \param Type Base Type. */ -LLVMMetadataRef -LLVMDIBuilderCreateQualifiedType(LLVMDIBuilderRef Builder, unsigned Tag, - LLVMMetadataRef Type); +LLVMMetadataRef llvmDIBuilderCreateQualifiedType(LLVMDIBuilderRef Builder, + unsigned Tag, + LLVMMetadataRef Type); /** * Create debugging information entry for a c++ @@ -858,16 +829,15 @@ * \param Tag Tag identifying type, * \param Type Base Type. */ -LLVMMetadataRef -LLVMDIBuilderCreateReferenceType(LLVMDIBuilderRef Builder, unsigned Tag, - LLVMMetadataRef Type); +LLVMMetadataRef llvmDIBuilderCreateReferenceType(LLVMDIBuilderRef Builder, + unsigned Tag, + LLVMMetadataRef Type); /** * Create C++11 nullptr type. * \param Builder The DIBuilder. */ -LLVMMetadataRef -LLVMDIBuilderCreateNullPtrType(LLVMDIBuilderRef Builder); +LLVMMetadataRef llvmDIBuilderCreateNullPtrType(LLVMDIBuilderRef Builder); /** * Create debugging information entry for a typedef. @@ -879,7 +849,7 @@ * \param Scope The surrounding context for the typedef. */ LLVMMetadataRef -LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type, +llvmDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Scope, uint32_t AlignInBits); @@ -895,10 +865,9 @@ * \param Flags Flags to describe inheritance attribute, e.g. private */ LLVMMetadataRef -LLVMDIBuilderCreateInheritance(LLVMDIBuilderRef Builder, - LLVMMetadataRef Ty, LLVMMetadataRef BaseTy, - uint64_t BaseOffset, uint32_t VBPtrOffset, - LLVMDIFlags Flags); +llvmDIBuilderCreateInheritance(LLVMDIBuilderRef Builder, LLVMMetadataRef Ty, + LLVMMetadataRef BaseTy, uint64_t BaseOffset, + uint32_t VBPtrOffset, LLVMDIFlags Flags); /** * Create a permanent forward-declared type. @@ -916,9 +885,9 @@ * \param UniqueIdentifier A unique identifier for the type. * \param UniqueIdentifierLen Length of the unique identifier. */ -LLVMMetadataRef LLVMDIBuilderCreateForwardDecl( - LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, - size_t NameLen, LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, +LLVMMetadataRef llvmDIBuilderCreateForwardDecl( + LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, size_t NameLen, + LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, unsigned RuntimeLang, uint64_t SizeInBits, uint32_t AlignInBits, const char *UniqueIdentifier, size_t UniqueIdentifierLen); @@ -939,10 +908,9 @@ * \param UniqueIdentifier A unique identifier for the type. * \param UniqueIdentifierLen Length of the unique identifier. */ -LLVMMetadataRef -LLVMDIBuilderCreateReplaceableCompositeType( - LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, - size_t NameLen, LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, +LLVMMetadataRef llvmDIBuilderCreateReplaceableCompositeType( + LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, size_t NameLen, + LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, unsigned RuntimeLang, uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, const char *UniqueIdentifier, size_t UniqueIdentifierLen); @@ -961,15 +929,11 @@ * \param Flags Flags to encode member attribute. * \param Type Parent type. */ -LLVMMetadataRef -LLVMDIBuilderCreateBitFieldMemberType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNumber, - uint64_t SizeInBits, - uint64_t OffsetInBits, - uint64_t StorageOffsetInBits, - LLVMDIFlags Flags, LLVMMetadataRef Type); +LLVMMetadataRef llvmDIBuilderCreateBitFieldMemberType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint64_t OffsetInBits, uint64_t StorageOffsetInBits, + LLVMDIFlags Flags, LLVMMetadataRef Type); /** * Create debugging information entry for a class. @@ -993,23 +957,22 @@ * \param UniqueIdentifier A unique identifier for the type. * \param UniqueIdentifierLen Length of the unique identifier. */ -LLVMMetadataRef LLVMDIBuilderCreateClassType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, - uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, - LLVMMetadataRef DerivedFrom, - LLVMMetadataRef *Elements, unsigned NumElements, - LLVMMetadataRef VTableHolder, LLVMMetadataRef TemplateParamsNode, - const char *UniqueIdentifier, size_t UniqueIdentifierLen); +LLVMMetadataRef llvmDIBuilderCreateClassType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, + LLVMDIFlags Flags, LLVMMetadataRef DerivedFrom, LLVMMetadataRef *Elements, + unsigned NumElements, LLVMMetadataRef VTableHolder, + LLVMMetadataRef TemplateParamsNode, const char *UniqueIdentifier, + size_t UniqueIdentifierLen); /** * Create a uniqued DIType* clone with FlagArtificial set. * \param Builder The DIBuilder. * \param Type The underlying type. */ -LLVMMetadataRef -LLVMDIBuilderCreateArtificialType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Type); +LLVMMetadataRef llvmDIBuilderCreateArtificialType(LLVMDIBuilderRef Builder, + LLVMMetadataRef Type); /** * Get the name of this DIType. @@ -1066,7 +1029,7 @@ * \param LowerBound Lower bound of the subrange, e.g. 0 for C, 1 for Fortran. * \param Count Count of elements in the subrange. */ -LLVMMetadataRef LLVMDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, int64_t LowerBound, int64_t Count); @@ -1076,7 +1039,7 @@ * \param Data The DI Node elements. * \param NumElements Number of DI Node elements. */ -LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateArray(LLVMDIBuilderRef Builder, LLVMMetadataRef *Data, size_t NumElements); @@ -1087,7 +1050,7 @@ * \param Addr An array of complex address operations. * \param Length Length of the address operation array. */ -LLVMMetadataRef LLVMDIBuilderCreateExpression(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateExpression(LLVMDIBuilderRef Builder, int64_t *Addr, size_t Length); /** @@ -1097,7 +1060,7 @@ * \param Value The constant value. */ LLVMMetadataRef -LLVMDIBuilderCreateConstantValueExpression(LLVMDIBuilderRef Builder, +llvmDIBuilderCreateConstantValueExpression(LLVMDIBuilderRef Builder, int64_t Value); /** @@ -1119,7 +1082,7 @@ * \param AlignInBits Variable alignment(or 0 if no alignment attr was * specified) */ -LLVMMetadataRef LLVMDIBuilderCreateGlobalVariableExpression( +LLVMMetadataRef llvmDIBuilderCreateGlobalVariableExpression( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *Linkage, size_t LinkLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool LocalToUnit, @@ -1211,7 +1174,7 @@ * \param AlignInBits Variable alignment(or 0 if no alignment attr was * specified) */ -LLVMMetadataRef LLVMDIBuilderCreateTempGlobalVariableFwdDecl( +LLVMMetadataRef llvmDIBuilderCreateTempGlobalVariableFwdDecl( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *Linkage, size_t LnkLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool LocalToUnit, @@ -1226,9 +1189,10 @@ * \param DebugLoc Debug info location. * \param Instr Instruction acting as a location for the new intrinsic. */ -LLVMValueRef LLVMDIBuilderInsertDeclareBefore( - LLVMDIBuilderRef Builder, LLVMValueRef Storage, LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, LLVMMetadataRef DebugLoc, LLVMValueRef Instr); +LLVMValueRef +llvmDIBuilderInsertDeclareBefore(LLVMDIBuilderRef Builder, LLVMValueRef Storage, + LLVMMetadataRef VarInfo, LLVMMetadataRef Expr, + LLVMMetadataRef DebugLoc, LLVMValueRef Instr); /** * Insert a new llvm.dbg.declare intrinsic call at the end of the given basic @@ -1241,7 +1205,7 @@ * \param DebugLoc Debug info location. * \param Block Basic block acting as a location for the new intrinsic. */ -LLVMValueRef LLVMDIBuilderInsertDeclareAtEnd( +LLVMValueRef llvmDIBuilderInsertDeclareAtEnd( LLVMDIBuilderRef Builder, LLVMValueRef Storage, LLVMMetadataRef VarInfo, LLVMMetadataRef Expr, LLVMMetadataRef DebugLoc, LLVMBasicBlockRef Block); @@ -1254,12 +1218,10 @@ * \param DebugLoc Debug info location. * \param Instr Instruction acting as a location for the new intrinsic. */ -LLVMValueRef LLVMDIBuilderInsertDbgValueBefore(LLVMDIBuilderRef Builder, - LLVMValueRef Val, - LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, - LLVMMetadataRef DebugLoc, - LLVMValueRef Instr); +LLVMValueRef +llvmDIBuilderInsertDbgValueBefore(LLVMDIBuilderRef Builder, LLVMValueRef Val, + LLVMMetadataRef VarInfo, LLVMMetadataRef Expr, + LLVMMetadataRef DebugLoc, LLVMValueRef Instr); /** * Insert a new llvm.dbg.value intrinsic call at the end of the given basic @@ -1272,12 +1234,9 @@ * \param DebugLoc Debug info location. * \param Block Basic block acting as a location for the new intrinsic. */ -LLVMValueRef LLVMDIBuilderInsertDbgValueAtEnd(LLVMDIBuilderRef Builder, - LLVMValueRef Val, - LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, - LLVMMetadataRef DebugLoc, - LLVMBasicBlockRef Block); +LLVMValueRef llvmDIBuilderInsertDbgValueAtEnd( + LLVMDIBuilderRef Builder, LLVMValueRef Val, LLVMMetadataRef VarInfo, + LLVMMetadataRef Expr, LLVMMetadataRef DebugLoc, LLVMBasicBlockRef Block); /** * Create a new descriptor for a local auto variable. @@ -1292,7 +1251,7 @@ * \param Flags Flags. * \param AlignInBits Variable alignment. */ -LLVMMetadataRef LLVMDIBuilderCreateAutoVariable( +LLVMMetadataRef llvmDIBuilderCreateAutoVariable( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool AlwaysPreserve, LLVMDIFlags Flags, uint32_t AlignInBits); @@ -1310,7 +1269,7 @@ * \param AlwaysPreserve If true, this descriptor will survive optimizations. * \param Flags Flags. */ -LLVMMetadataRef LLVMDIBuilderCreateParameterVariable( +LLVMMetadataRef llvmDIBuilderCreateParameterVariable( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, unsigned ArgNo, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool AlwaysPreserve, LLVMDIFlags Flags); diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp --- a/llvm/lib/IR/DebugInfo.cpp +++ b/llvm/lib/IR/DebugInfo.cpp @@ -905,11 +905,11 @@ delete unwrap(Builder); } -void LLVMDIBuilderFinalize(LLVMDIBuilderRef Builder) { +void llvmDIBuilderFinalize(LLVMDIBuilderRef Builder) { unwrap(Builder)->finalize(); } -LLVMMetadataRef LLVMDIBuilderCreateCompileUnit( +LLVMMetadataRef llvmDIBuilderCreateCompileUnit( LLVMDIBuilderRef Builder, LLVMDWARFSourceLanguage Lang, LLVMMetadataRef FileRef, const char *Producer, size_t ProducerLen, LLVMBool isOptimized, const char *Flags, size_t FlagsLen, @@ -929,16 +929,17 @@ StringRef(SysRoot, SysRootLen), StringRef(SDK, SDKLen))); } -LLVMMetadataRef -LLVMDIBuilderCreateFile(LLVMDIBuilderRef Builder, const char *Filename, - size_t FilenameLen, const char *Directory, - size_t DirectoryLen) { +LLVMMetadataRef llvmDIBuilderCreateFile(LLVMDIBuilderRef Builder, + const char *Filename, + size_t FilenameLen, + const char *Directory, + size_t DirectoryLen) { return wrap(unwrap(Builder)->createFile(StringRef(Filename, FilenameLen), StringRef(Directory, DirectoryLen))); } LLVMMetadataRef -LLVMDIBuilderCreateModule(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentScope, +llvmDIBuilderCreateModule(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentScope, const char *Name, size_t NameLen, const char *ConfigMacros, size_t ConfigMacrosLen, const char *IncludePath, size_t IncludePathLen, @@ -950,7 +951,7 @@ StringRef(APINotesFile, APINotesFileLen))); } -LLVMMetadataRef LLVMDIBuilderCreateNameSpace(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateNameSpace(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentScope, const char *Name, size_t NameLen, LLVMBool ExportSymbols) { @@ -958,12 +959,12 @@ unwrapDI(ParentScope), StringRef(Name, NameLen), ExportSymbols)); } -LLVMMetadataRef LLVMDIBuilderCreateFunction( +LLVMMetadataRef llvmDIBuilderCreateFunction( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *LinkageName, size_t LinkageNameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, - LLVMBool IsLocalToUnit, LLVMBool IsDefinition, - unsigned ScopeLine, LLVMDIFlags Flags, LLVMBool IsOptimized) { + LLVMBool IsLocalToUnit, LLVMBool IsDefinition, unsigned ScopeLine, + LLVMDIFlags Flags, LLVMBool IsOptimized) { return wrap(unwrap(Builder)->createFunction( unwrapDI(Scope), {Name, NameLen}, {LinkageName, LinkageNameLen}, unwrapDI(File), LineNo, unwrapDI(Ty), ScopeLine, @@ -972,78 +973,64 @@ nullptr, nullptr)); } - -LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock( - LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, - LLVMMetadataRef File, unsigned Line, unsigned Col) { +LLVMMetadataRef llvmDIBuilderCreateLexicalBlock(LLVMDIBuilderRef Builder, + LLVMMetadataRef Scope, + LLVMMetadataRef File, + unsigned Line, unsigned Col) { return wrap(unwrap(Builder)->createLexicalBlock(unwrapDI(Scope), unwrapDI(File), Line, Col)); } -LLVMMetadataRef -LLVMDIBuilderCreateLexicalBlockFile(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef File, - unsigned Discriminator) { +LLVMMetadataRef llvmDIBuilderCreateLexicalBlockFile(LLVMDIBuilderRef Builder, + LLVMMetadataRef Scope, + LLVMMetadataRef File, + unsigned Discriminator) { return wrap(unwrap(Builder)->createLexicalBlockFile(unwrapDI(Scope), unwrapDI(File), Discriminator)); } -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromNamespace(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef NS, - LLVMMetadataRef File, - unsigned Line) { +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromNamespace( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef NS, + LLVMMetadataRef File, unsigned Line) { return wrap(unwrap(Builder)->createImportedModule(unwrapDI(Scope), unwrapDI(NS), unwrapDI(File), Line)); } -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromAlias(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef ImportedEntity, - LLVMMetadataRef File, - unsigned Line) { +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromAlias( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, + LLVMMetadataRef ImportedEntity, LLVMMetadataRef File, unsigned Line) { return wrap(unwrap(Builder)->createImportedModule( unwrapDI(Scope), unwrapDI(ImportedEntity), unwrapDI(File), Line)); } -LLVMMetadataRef -LLVMDIBuilderCreateImportedModuleFromModule(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef M, - LLVMMetadataRef File, - unsigned Line) { +LLVMMetadataRef llvmDIBuilderCreateImportedModuleFromModule( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef M, + LLVMMetadataRef File, unsigned Line) { return wrap(unwrap(Builder)->createImportedModule(unwrapDI(Scope), unwrapDI(M), unwrapDI(File), Line)); } -LLVMMetadataRef -LLVMDIBuilderCreateImportedDeclaration(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - LLVMMetadataRef Decl, - LLVMMetadataRef File, - unsigned Line, - const char *Name, size_t NameLen) { +LLVMMetadataRef llvmDIBuilderCreateImportedDeclaration( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, LLVMMetadataRef Decl, + LLVMMetadataRef File, unsigned Line, const char *Name, size_t NameLen) { return wrap(unwrap(Builder)->createImportedDeclaration( unwrapDI(Scope), unwrapDI(Decl), unwrapDI(File), Line, {Name, NameLen})); } -LLVMMetadataRef -LLVMDIBuilderCreateDebugLocation(LLVMContextRef Ctx, unsigned Line, - unsigned Column, LLVMMetadataRef Scope, - LLVMMetadataRef InlinedAt) { +LLVMMetadataRef llvmDIBuilderCreateDebugLocation(LLVMContextRef Ctx, + unsigned Line, unsigned Column, + LLVMMetadataRef Scope, + LLVMMetadataRef InlinedAt) { return wrap(DILocation::get(*unwrap(Ctx), Line, Column, unwrap(Scope), unwrap(InlinedAt))); } @@ -1089,7 +1076,7 @@ return ""; } -LLVMMetadataRef LLVMDIBuilderCreateMacro(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateMacro(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentMacroFile, unsigned Line, LLVMDWARFMacinfoRecordType RecordType, @@ -1102,14 +1089,14 @@ } LLVMMetadataRef -LLVMDIBuilderCreateTempMacroFile(LLVMDIBuilderRef Builder, +llvmDIBuilderCreateTempMacroFile(LLVMDIBuilderRef Builder, LLVMMetadataRef ParentMacroFile, unsigned Line, LLVMMetadataRef File) { return wrap(unwrap(Builder)->createTempMacroFile( unwrapDI(ParentMacroFile), Line, unwrapDI(File))); } -LLVMMetadataRef LLVMDIBuilderCreateEnumerator(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateEnumerator(LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, int64_t Value, LLVMBool IsUnsigned) { @@ -1117,24 +1104,24 @@ IsUnsigned != 0)); } -LLVMMetadataRef LLVMDIBuilderCreateEnumerationType( - LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, - size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, - uint64_t SizeInBits, uint32_t AlignInBits, LLVMMetadataRef *Elements, - unsigned NumElements, LLVMMetadataRef ClassTy) { -auto Elts = unwrap(Builder)->getOrCreateArray({unwrap(Elements), - NumElements}); -return wrap(unwrap(Builder)->createEnumerationType( - unwrapDI(Scope), {Name, NameLen}, unwrapDI(File), - LineNumber, SizeInBits, AlignInBits, Elts, unwrapDI(ClassTy))); -} - -LLVMMetadataRef LLVMDIBuilderCreateUnionType( - LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, - size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, - uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, - LLVMMetadataRef *Elements, unsigned NumElements, unsigned RunTimeLang, - const char *UniqueId, size_t UniqueIdLen) { +LLVMMetadataRef llvmDIBuilderCreateEnumerationType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint32_t AlignInBits, LLVMMetadataRef *Elements, + unsigned NumElements, LLVMMetadataRef ClassTy) { + auto Elts = + unwrap(Builder)->getOrCreateArray({unwrap(Elements), NumElements}); + return wrap(unwrap(Builder)->createEnumerationType( + unwrapDI(Scope), {Name, NameLen}, unwrapDI(File), + LineNumber, SizeInBits, AlignInBits, Elts, unwrapDI(ClassTy))); +} + +LLVMMetadataRef llvmDIBuilderCreateUnionType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, + LLVMMetadataRef *Elements, unsigned NumElements, unsigned RunTimeLang, + const char *UniqueId, size_t UniqueIdLen) { auto Elts = unwrap(Builder)->getOrCreateArray({unwrap(Elements), NumElements}); return wrap(unwrap(Builder)->createUnionType( @@ -1143,49 +1130,45 @@ Elts, RunTimeLang, {UniqueId, UniqueIdLen})); } - -LLVMMetadataRef -LLVMDIBuilderCreateArrayType(LLVMDIBuilderRef Builder, uint64_t Size, - uint32_t AlignInBits, LLVMMetadataRef Ty, - LLVMMetadataRef *Subscripts, - unsigned NumSubscripts) { +LLVMMetadataRef llvmDIBuilderCreateArrayType( + LLVMDIBuilderRef Builder, uint64_t Size, uint32_t AlignInBits, + LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts) { auto Subs = unwrap(Builder)->getOrCreateArray({unwrap(Subscripts), NumSubscripts}); return wrap(unwrap(Builder)->createArrayType(Size, AlignInBits, unwrapDI(Ty), Subs)); } -LLVMMetadataRef -LLVMDIBuilderCreateVectorType(LLVMDIBuilderRef Builder, uint64_t Size, - uint32_t AlignInBits, LLVMMetadataRef Ty, - LLVMMetadataRef *Subscripts, - unsigned NumSubscripts) { +LLVMMetadataRef llvmDIBuilderCreateVectorType( + LLVMDIBuilderRef Builder, uint64_t Size, uint32_t AlignInBits, + LLVMMetadataRef Ty, LLVMMetadataRef *Subscripts, unsigned NumSubscripts) { auto Subs = unwrap(Builder)->getOrCreateArray({unwrap(Subscripts), NumSubscripts}); return wrap(unwrap(Builder)->createVectorType(Size, AlignInBits, unwrapDI(Ty), Subs)); } -LLVMMetadataRef -LLVMDIBuilderCreateBasicType(LLVMDIBuilderRef Builder, const char *Name, - size_t NameLen, uint64_t SizeInBits, - LLVMDWARFTypeEncoding Encoding, - LLVMDIFlags Flags) { +LLVMMetadataRef llvmDIBuilderCreateBasicType(LLVMDIBuilderRef Builder, + const char *Name, size_t NameLen, + uint64_t SizeInBits, + LLVMDWARFTypeEncoding Encoding, + LLVMDIFlags Flags) { return wrap(unwrap(Builder)->createBasicType({Name, NameLen}, SizeInBits, Encoding, map_from_llvmDIFlags(Flags))); } -LLVMMetadataRef LLVMDIBuilderCreatePointerType( - LLVMDIBuilderRef Builder, LLVMMetadataRef PointeeTy, - uint64_t SizeInBits, uint32_t AlignInBits, unsigned AddressSpace, - const char *Name, size_t NameLen) { +LLVMMetadataRef +llvmDIBuilderCreatePointerType(LLVMDIBuilderRef Builder, + LLVMMetadataRef PointeeTy, uint64_t SizeInBits, + uint32_t AlignInBits, unsigned AddressSpace, + const char *Name, size_t NameLen) { return wrap(unwrap(Builder)->createPointerType(unwrapDI(PointeeTy), SizeInBits, AlignInBits, AddressSpace, {Name, NameLen})); } -LLVMMetadataRef LLVMDIBuilderCreateStructType( +LLVMMetadataRef llvmDIBuilderCreateStructType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, @@ -1201,7 +1184,7 @@ unwrapDI(VTableHolder), {UniqueId, UniqueIdLen})); } -LLVMMetadataRef LLVMDIBuilderCreateMemberType( +LLVMMetadataRef llvmDIBuilderCreateMemberType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, @@ -1211,14 +1194,13 @@ OffsetInBits, map_from_llvmDIFlags(Flags), unwrapDI(Ty))); } -LLVMMetadataRef -LLVMDIBuilderCreateUnspecifiedType(LLVMDIBuilderRef Builder, const char *Name, - size_t NameLen) { +LLVMMetadataRef llvmDIBuilderCreateUnspecifiedType(LLVMDIBuilderRef Builder, + const char *Name, + size_t NameLen) { return wrap(unwrap(Builder)->createUnspecifiedType({Name, NameLen})); } -LLVMMetadataRef -LLVMDIBuilderCreateStaticMemberType( +LLVMMetadataRef llvmDIBuilderCreateStaticMemberType( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, LLVMMetadataRef Type, LLVMDIFlags Flags, LLVMValueRef ConstantVal, @@ -1230,13 +1212,11 @@ AlignInBits)); } -LLVMMetadataRef -LLVMDIBuilderCreateObjCIVar(LLVMDIBuilderRef Builder, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNo, - uint64_t SizeInBits, uint32_t AlignInBits, - uint64_t OffsetInBits, LLVMDIFlags Flags, - LLVMMetadataRef Ty, LLVMMetadataRef PropertyNode) { +LLVMMetadataRef llvmDIBuilderCreateObjCIVar( + LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, + LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits, + uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, + LLVMMetadataRef Ty, LLVMMetadataRef PropertyNode) { return wrap(unwrap(Builder)->createObjCIVar( {Name, NameLen}, unwrapDI(File), LineNo, SizeInBits, AlignInBits, OffsetInBits, @@ -1244,28 +1224,24 @@ unwrapDI(PropertyNode))); } -LLVMMetadataRef -LLVMDIBuilderCreateObjCProperty(LLVMDIBuilderRef Builder, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNo, - const char *GetterName, size_t GetterNameLen, - const char *SetterName, size_t SetterNameLen, - unsigned PropertyAttributes, - LLVMMetadataRef Ty) { +LLVMMetadataRef llvmDIBuilderCreateObjCProperty( + LLVMDIBuilderRef Builder, const char *Name, size_t NameLen, + LLVMMetadataRef File, unsigned LineNo, const char *GetterName, + size_t GetterNameLen, const char *SetterName, size_t SetterNameLen, + unsigned PropertyAttributes, LLVMMetadataRef Ty) { return wrap(unwrap(Builder)->createObjCProperty( {Name, NameLen}, unwrapDI(File), LineNo, {GetterName, GetterNameLen}, {SetterName, SetterNameLen}, PropertyAttributes, unwrapDI(Ty))); } -LLVMMetadataRef -LLVMDIBuilderCreateObjectPointerType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Type) { +LLVMMetadataRef llvmDIBuilderCreateObjectPointerType(LLVMDIBuilderRef Builder, + LLVMMetadataRef Type) { return wrap(unwrap(Builder)->createObjectPointerType(unwrapDI(Type))); } LLVMMetadataRef -LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type, +llvmDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Scope, uint32_t AlignInBits) { @@ -1275,19 +1251,17 @@ } LLVMMetadataRef -LLVMDIBuilderCreateInheritance(LLVMDIBuilderRef Builder, - LLVMMetadataRef Ty, LLVMMetadataRef BaseTy, - uint64_t BaseOffset, uint32_t VBPtrOffset, - LLVMDIFlags Flags) { +llvmDIBuilderCreateInheritance(LLVMDIBuilderRef Builder, LLVMMetadataRef Ty, + LLVMMetadataRef BaseTy, uint64_t BaseOffset, + uint32_t VBPtrOffset, LLVMDIFlags Flags) { return wrap(unwrap(Builder)->createInheritance( unwrapDI(Ty), unwrapDI(BaseTy), BaseOffset, VBPtrOffset, map_from_llvmDIFlags(Flags))); } -LLVMMetadataRef -LLVMDIBuilderCreateForwardDecl( - LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, - size_t NameLen, LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, +LLVMMetadataRef llvmDIBuilderCreateForwardDecl( + LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, size_t NameLen, + LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, unsigned RuntimeLang, uint64_t SizeInBits, uint32_t AlignInBits, const char *UniqueIdentifier, size_t UniqueIdentifierLen) { return wrap(unwrap(Builder)->createForwardDecl( @@ -1296,10 +1270,9 @@ AlignInBits, {UniqueIdentifier, UniqueIdentifierLen})); } -LLVMMetadataRef -LLVMDIBuilderCreateReplaceableCompositeType( - LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, - size_t NameLen, LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, +LLVMMetadataRef llvmDIBuilderCreateReplaceableCompositeType( + LLVMDIBuilderRef Builder, unsigned Tag, const char *Name, size_t NameLen, + LLVMMetadataRef Scope, LLVMMetadataRef File, unsigned Line, unsigned RuntimeLang, uint64_t SizeInBits, uint32_t AlignInBits, LLVMDIFlags Flags, const char *UniqueIdentifier, size_t UniqueIdentifierLen) { @@ -1310,47 +1283,39 @@ {UniqueIdentifier, UniqueIdentifierLen})); } -LLVMMetadataRef -LLVMDIBuilderCreateQualifiedType(LLVMDIBuilderRef Builder, unsigned Tag, - LLVMMetadataRef Type) { +LLVMMetadataRef llvmDIBuilderCreateQualifiedType(LLVMDIBuilderRef Builder, + unsigned Tag, + LLVMMetadataRef Type) { return wrap(unwrap(Builder)->createQualifiedType(Tag, unwrapDI(Type))); } -LLVMMetadataRef -LLVMDIBuilderCreateReferenceType(LLVMDIBuilderRef Builder, unsigned Tag, - LLVMMetadataRef Type) { +LLVMMetadataRef llvmDIBuilderCreateReferenceType(LLVMDIBuilderRef Builder, + unsigned Tag, + LLVMMetadataRef Type) { return wrap(unwrap(Builder)->createReferenceType(Tag, unwrapDI(Type))); } -LLVMMetadataRef -LLVMDIBuilderCreateNullPtrType(LLVMDIBuilderRef Builder) { +LLVMMetadataRef llvmDIBuilderCreateNullPtrType(LLVMDIBuilderRef Builder) { return wrap(unwrap(Builder)->createNullPtrType()); } -LLVMMetadataRef -LLVMDIBuilderCreateMemberPointerType(LLVMDIBuilderRef Builder, - LLVMMetadataRef PointeeType, - LLVMMetadataRef ClassType, - uint64_t SizeInBits, - uint32_t AlignInBits, - LLVMDIFlags Flags) { +LLVMMetadataRef llvmDIBuilderCreateMemberPointerType( + LLVMDIBuilderRef Builder, LLVMMetadataRef PointeeType, + LLVMMetadataRef ClassType, uint64_t SizeInBits, uint32_t AlignInBits, + LLVMDIFlags Flags) { return wrap(unwrap(Builder)->createMemberPointerType( unwrapDI(PointeeType), unwrapDI(ClassType), AlignInBits, SizeInBits, map_from_llvmDIFlags(Flags))); } -LLVMMetadataRef -LLVMDIBuilderCreateBitFieldMemberType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, - const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNumber, - uint64_t SizeInBits, - uint64_t OffsetInBits, - uint64_t StorageOffsetInBits, - LLVMDIFlags Flags, LLVMMetadataRef Type) { +LLVMMetadataRef llvmDIBuilderCreateBitFieldMemberType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint64_t OffsetInBits, uint64_t StorageOffsetInBits, + LLVMDIFlags Flags, LLVMMetadataRef Type) { return wrap(unwrap(Builder)->createBitFieldMemberType( unwrapDI(Scope), {Name, NameLen}, unwrapDI(File), LineNumber, @@ -1358,14 +1323,14 @@ map_from_llvmDIFlags(Flags), unwrapDI(Type))); } -LLVMMetadataRef LLVMDIBuilderCreateClassType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Scope, const char *Name, size_t NameLen, - LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, - uint32_t AlignInBits, uint64_t OffsetInBits, LLVMDIFlags Flags, - LLVMMetadataRef DerivedFrom, - LLVMMetadataRef *Elements, unsigned NumElements, - LLVMMetadataRef VTableHolder, LLVMMetadataRef TemplateParamsNode, - const char *UniqueIdentifier, size_t UniqueIdentifierLen) { +LLVMMetadataRef llvmDIBuilderCreateClassType( + LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + size_t NameLen, LLVMMetadataRef File, unsigned LineNumber, + uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, + LLVMDIFlags Flags, LLVMMetadataRef DerivedFrom, LLVMMetadataRef *Elements, + unsigned NumElements, LLVMMetadataRef VTableHolder, + LLVMMetadataRef TemplateParamsNode, const char *UniqueIdentifier, + size_t UniqueIdentifierLen) { auto Elts = unwrap(Builder)->getOrCreateArray({unwrap(Elements), NumElements}); return wrap(unwrap(Builder)->createClassType( @@ -1378,9 +1343,8 @@ {UniqueIdentifier, UniqueIdentifierLen})); } -LLVMMetadataRef -LLVMDIBuilderCreateArtificialType(LLVMDIBuilderRef Builder, - LLVMMetadataRef Type) { +LLVMMetadataRef llvmDIBuilderCreateArtificialType(LLVMDIBuilderRef Builder, + LLVMMetadataRef Type) { return wrap(unwrap(Builder)->createArtificialType(unwrapDI(Type))); } @@ -1410,38 +1374,36 @@ return map_to_llvmDIFlags(unwrapDI(DType)->getFlags()); } -LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateTypeArray(LLVMDIBuilderRef Builder, LLVMMetadataRef *Types, size_t Length) { return wrap( unwrap(Builder)->getOrCreateTypeArray({unwrap(Types), Length}).get()); } -LLVMMetadataRef -LLVMDIBuilderCreateSubroutineType(LLVMDIBuilderRef Builder, - LLVMMetadataRef File, - LLVMMetadataRef *ParameterTypes, - unsigned NumParameterTypes, - LLVMDIFlags Flags) { +LLVMMetadataRef llvmDIBuilderCreateSubroutineType( + LLVMDIBuilderRef Builder, LLVMMetadataRef File, + LLVMMetadataRef *ParameterTypes, unsigned NumParameterTypes, + LLVMDIFlags Flags) { auto Elts = unwrap(Builder)->getOrCreateTypeArray({unwrap(ParameterTypes), NumParameterTypes}); return wrap(unwrap(Builder)->createSubroutineType( Elts, map_from_llvmDIFlags(Flags))); } -LLVMMetadataRef LLVMDIBuilderCreateExpression(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderCreateExpression(LLVMDIBuilderRef Builder, int64_t *Addr, size_t Length) { return wrap(unwrap(Builder)->createExpression(ArrayRef(Addr, Length))); } LLVMMetadataRef -LLVMDIBuilderCreateConstantValueExpression(LLVMDIBuilderRef Builder, +llvmDIBuilderCreateConstantValueExpression(LLVMDIBuilderRef Builder, int64_t Value) { return wrap(unwrap(Builder)->createConstantValueExpression(Value)); } -LLVMMetadataRef LLVMDIBuilderCreateGlobalVariableExpression( +LLVMMetadataRef llvmDIBuilderCreateGlobalVariableExpression( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *Linkage, size_t LinkLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool LocalToUnit, @@ -1491,7 +1453,7 @@ MDNode::deleteTemporary(Node); } -LLVMMetadataRef LLVMDIBuilderCreateTempGlobalVariableFwdDecl( +LLVMMetadataRef llvmDIBuilderCreateTempGlobalVariableFwdDecl( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, const char *Linkage, size_t LnkLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool LocalToUnit, @@ -1503,7 +1465,7 @@ } LLVMValueRef -LLVMDIBuilderInsertDeclareBefore(LLVMDIBuilderRef Builder, LLVMValueRef Storage, +llvmDIBuilderInsertDeclareBefore(LLVMDIBuilderRef Builder, LLVMValueRef Storage, LLVMMetadataRef VarInfo, LLVMMetadataRef Expr, LLVMMetadataRef DL, LLVMValueRef Instr) { return wrap(unwrap(Builder)->insertDeclare( @@ -1512,40 +1474,35 @@ unwrap(Instr))); } -LLVMValueRef LLVMDIBuilderInsertDeclareAtEnd( - LLVMDIBuilderRef Builder, LLVMValueRef Storage, LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, LLVMMetadataRef DL, LLVMBasicBlockRef Block) { +LLVMValueRef +llvmDIBuilderInsertDeclareAtEnd(LLVMDIBuilderRef Builder, LLVMValueRef Storage, + LLVMMetadataRef VarInfo, LLVMMetadataRef Expr, + LLVMMetadataRef DL, LLVMBasicBlockRef Block) { return wrap(unwrap(Builder)->insertDeclare( unwrap(Storage), unwrap(VarInfo), unwrap(Expr), unwrap(DL), unwrap(Block))); } -LLVMValueRef LLVMDIBuilderInsertDbgValueBefore(LLVMDIBuilderRef Builder, - LLVMValueRef Val, - LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, - LLVMMetadataRef DebugLoc, - LLVMValueRef Instr) { +LLVMValueRef llvmDIBuilderInsertDbgValueBefore( + LLVMDIBuilderRef Builder, LLVMValueRef Val, LLVMMetadataRef VarInfo, + LLVMMetadataRef Expr, LLVMMetadataRef DebugLoc, LLVMValueRef Instr) { return wrap(unwrap(Builder)->insertDbgValueIntrinsic( unwrap(Val), unwrap(VarInfo), unwrap(Expr), unwrap(DebugLoc), unwrap(Instr))); } -LLVMValueRef LLVMDIBuilderInsertDbgValueAtEnd(LLVMDIBuilderRef Builder, - LLVMValueRef Val, - LLVMMetadataRef VarInfo, - LLVMMetadataRef Expr, - LLVMMetadataRef DebugLoc, - LLVMBasicBlockRef Block) { +LLVMValueRef llvmDIBuilderInsertDbgValueAtEnd( + LLVMDIBuilderRef Builder, LLVMValueRef Val, LLVMMetadataRef VarInfo, + LLVMMetadataRef Expr, LLVMMetadataRef DebugLoc, LLVMBasicBlockRef Block) { return wrap(unwrap(Builder)->insertDbgValueIntrinsic( unwrap(Val), unwrap(VarInfo), unwrap(Expr), unwrap(DebugLoc), unwrap(Block))); } -LLVMMetadataRef LLVMDIBuilderCreateAutoVariable( +LLVMMetadataRef llvmDIBuilderCreateAutoVariable( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool AlwaysPreserve, LLVMDIFlags Flags, uint32_t AlignInBits) { @@ -1555,7 +1512,7 @@ map_from_llvmDIFlags(Flags), AlignInBits)); } -LLVMMetadataRef LLVMDIBuilderCreateParameterVariable( +LLVMMetadataRef llvmDIBuilderCreateParameterVariable( LLVMDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, size_t NameLen, unsigned ArgNo, LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Ty, LLVMBool AlwaysPreserve, LLVMDIFlags Flags) { @@ -1565,12 +1522,12 @@ map_from_llvmDIFlags(Flags))); } -LLVMMetadataRef LLVMDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateSubrange(LLVMDIBuilderRef Builder, int64_t Lo, int64_t Count) { return wrap(unwrap(Builder)->getOrCreateSubrange(Lo, Count)); } -LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(LLVMDIBuilderRef Builder, +LLVMMetadataRef llvmDIBuilderGetOrCreateArray(LLVMDIBuilderRef Builder, LLVMMetadataRef *Data, size_t Length) { Metadata **DataValue = unwrap(Data); diff --git a/llvm/tools/llvm-c-test/debuginfo.c b/llvm/tools/llvm-c-test/debuginfo.c --- a/llvm/tools/llvm-c-test/debuginfo.c +++ b/llvm/tools/llvm-c-test/debuginfo.c @@ -19,12 +19,18 @@ static LLVMMetadataRef declare_objc_class(LLVMDIBuilderRef DIB, LLVMMetadataRef File) { - LLVMMetadataRef Decl = LLVMDIBuilderCreateStructType(DIB, File, "TestClass", 9, File, 42, 64, 0, LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0); - LLVMMetadataRef SuperDecl = LLVMDIBuilderCreateStructType(DIB, File, "TestSuperClass", 14, File, 42, 64, 0, LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0); - LLVMDIBuilderCreateInheritance(DIB, Decl, SuperDecl, 0, 0, 0); - LLVMMetadataRef TestProperty = - LLVMDIBuilderCreateObjCProperty(DIB, "test", 4, File, 42, "getTest", 7, "setTest", 7, 0x20 /*copy*/ | 0x40 /*nonatomic*/, SuperDecl); - LLVMDIBuilderCreateObjCIVar(DIB, "_test", 5, File, 42, 64, 0, 64, LLVMDIFlagPublic, SuperDecl, TestProperty); + LLVMMetadataRef Decl = llvmDIBuilderCreateStructType( + DIB, File, "TestClass", 9, File, 42, 64, 0, LLVMDIFlagObjcClassComplete, + NULL, NULL, 0, 0, NULL, NULL, 0); + LLVMMetadataRef SuperDecl = llvmDIBuilderCreateStructType( + DIB, File, "TestSuperClass", 14, File, 42, 64, 0, + LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0); + llvmDIBuilderCreateInheritance(DIB, Decl, SuperDecl, 0, 0, 0); + LLVMMetadataRef TestProperty = llvmDIBuilderCreateObjCProperty( + DIB, "test", 4, File, 42, "getTest", 7, "setTest", 7, + 0x20 /*copy*/ | 0x40 /*nonatomic*/, SuperDecl); + llvmDIBuilderCreateObjCIVar(DIB, "_test", 5, File, 42, 64, 0, 64, + LLVMDIFlagPublic, SuperDecl, TestProperty); return Decl; } @@ -33,61 +39,53 @@ LLVMModuleRef M = LLVMModuleCreateWithName(Filename); LLVMDIBuilderRef DIB = LLVMCreateDIBuilder(M); - LLVMMetadataRef File = LLVMDIBuilderCreateFile(DIB, Filename, - strlen(Filename), ".", 1); + LLVMMetadataRef File = + llvmDIBuilderCreateFile(DIB, Filename, strlen(Filename), ".", 1); - LLVMMetadataRef CompileUnit = LLVMDIBuilderCreateCompileUnit( + LLVMMetadataRef CompileUnit = llvmDIBuilderCreateCompileUnit( DIB, LLVMDWARFSourceLanguageC, File, "llvm-c-test", 11, 0, NULL, 0, 0, NULL, 0, LLVMDWARFEmissionFull, 0, 0, 0, "/", 1, "", 0); LLVMMetadataRef Module = - LLVMDIBuilderCreateModule(DIB, CompileUnit, - "llvm-c-test", 11, - "", 0, - "/test/include/llvm-c-test.h", 27, - "", 0); - - LLVMMetadataRef OtherModule = - LLVMDIBuilderCreateModule(DIB, CompileUnit, - "llvm-c-test-import", 18, - "", 0, - "/test/include/llvm-c-test-import.h", 34, - "", 0); - LLVMMetadataRef ImportedModule = - LLVMDIBuilderCreateImportedModuleFromModule(DIB, Module, OtherModule, - File, 42); - LLVMDIBuilderCreateImportedModuleFromAlias(DIB, Module, ImportedModule, - File, 42); + llvmDIBuilderCreateModule(DIB, CompileUnit, "llvm-c-test", 11, "", 0, + "/test/include/llvm-c-test.h", 27, "", 0); + + LLVMMetadataRef OtherModule = llvmDIBuilderCreateModule( + DIB, CompileUnit, "llvm-c-test-import", 18, "", 0, + "/test/include/llvm-c-test-import.h", 34, "", 0); + LLVMMetadataRef ImportedModule = llvmDIBuilderCreateImportedModuleFromModule( + DIB, Module, OtherModule, File, 42); + llvmDIBuilderCreateImportedModuleFromAlias(DIB, Module, ImportedModule, File, + 42); LLVMMetadataRef ClassTy = declare_objc_class(DIB, File); LLVMMetadataRef GlobalClassValueExpr = - LLVMDIBuilderCreateConstantValueExpression(DIB, 0); - LLVMDIBuilderCreateGlobalVariableExpression( - DIB, Module, "globalClass", 11, "", 0, File, 1, ClassTy, true, - GlobalClassValueExpr, NULL, 0); + llvmDIBuilderCreateConstantValueExpression(DIB, 0); + llvmDIBuilderCreateGlobalVariableExpression(DIB, Module, "globalClass", 11, + "", 0, File, 1, ClassTy, true, + GlobalClassValueExpr, NULL, 0); LLVMMetadataRef Int64Ty = - LLVMDIBuilderCreateBasicType(DIB, "Int64", 5, 64, 0, LLVMDIFlagZero); + llvmDIBuilderCreateBasicType(DIB, "Int64", 5, 64, 0, LLVMDIFlagZero); LLVMMetadataRef Int64TypeDef = - LLVMDIBuilderCreateTypedef(DIB, Int64Ty, "int64_t", 7, File, 42, File, 0); + llvmDIBuilderCreateTypedef(DIB, Int64Ty, "int64_t", 7, File, 42, File, 0); LLVMMetadataRef GlobalVarValueExpr = - LLVMDIBuilderCreateConstantValueExpression(DIB, 0); - LLVMDIBuilderCreateGlobalVariableExpression( - DIB, Module, "global", 6, "", 0, File, 1, Int64TypeDef, true, - GlobalVarValueExpr, NULL, 0); + llvmDIBuilderCreateConstantValueExpression(DIB, 0); + llvmDIBuilderCreateGlobalVariableExpression(DIB, Module, "global", 6, "", 0, + File, 1, Int64TypeDef, true, + GlobalVarValueExpr, NULL, 0); LLVMMetadataRef NameSpace = - LLVMDIBuilderCreateNameSpace(DIB, Module, "NameSpace", 9, false); + llvmDIBuilderCreateNameSpace(DIB, Module, "NameSpace", 9, false); LLVMMetadataRef StructDbgElts[] = {Int64Ty, Int64Ty, Int64Ty}; - LLVMMetadataRef StructDbgTy = - LLVMDIBuilderCreateStructType(DIB, NameSpace, "MyStruct", - 8, File, 0, 192, 0, 0, NULL, StructDbgElts, 3, - LLVMDWARFSourceLanguageC, NULL, "MyStruct", 8); + LLVMMetadataRef StructDbgTy = llvmDIBuilderCreateStructType( + DIB, NameSpace, "MyStruct", 8, File, 0, 192, 0, 0, NULL, StructDbgElts, 3, + LLVMDWARFSourceLanguageC, NULL, "MyStruct", 8); LLVMMetadataRef StructDbgPtrTy = - LLVMDIBuilderCreatePointerType(DIB, StructDbgTy, 192, 0, 0, "", 0); + llvmDIBuilderCreatePointerType(DIB, StructDbgTy, 192, 0, 0, "", 0); LLVMAddNamedMetadataOperand(M, "FooType", LLVMMetadataAsValue(LLVMGetModuleContext(M), StructDbgPtrTy)); @@ -103,95 +101,84 @@ LLVMBasicBlockRef FooEntryBlock = LLVMAppendBasicBlock(FooFunction, "entry"); LLVMMetadataRef Subscripts[] = { - LLVMDIBuilderGetOrCreateSubrange(DIB, 0, 10), + llvmDIBuilderGetOrCreateSubrange(DIB, 0, 10), }; LLVMMetadataRef VectorTy = - LLVMDIBuilderCreateVectorType(DIB, 64 * 10, 0, - Int64Ty, Subscripts, 1); - + llvmDIBuilderCreateVectorType(DIB, 64 * 10, 0, Int64Ty, Subscripts, 1); LLVMMetadataRef ParamTypes[] = {Int64Ty, Int64Ty, VectorTy}; LLVMMetadataRef FunctionTy = - LLVMDIBuilderCreateSubroutineType(DIB, File, ParamTypes, 3, 0); + llvmDIBuilderCreateSubroutineType(DIB, File, ParamTypes, 3, 0); LLVMMetadataRef ReplaceableFunctionMetadata = - LLVMDIBuilderCreateReplaceableCompositeType(DIB, 0x15, "foo", 3, - File, File, 42, - 0, 0, 0, - LLVMDIFlagFwdDecl, - "", 0); - - LLVMMetadataRef FooParamLocation = - LLVMDIBuilderCreateDebugLocation(LLVMGetGlobalContext(), 42, 0, - ReplaceableFunctionMetadata, NULL); + llvmDIBuilderCreateReplaceableCompositeType(DIB, 0x15, "foo", 3, File, + File, 42, 0, 0, 0, + LLVMDIFlagFwdDecl, "", 0); + + LLVMMetadataRef FooParamLocation = llvmDIBuilderCreateDebugLocation( + LLVMGetGlobalContext(), 42, 0, ReplaceableFunctionMetadata, NULL); LLVMMetadataRef FunctionMetadata = - LLVMDIBuilderCreateFunction(DIB, File, "foo", 3, "foo", 3, - File, 42, FunctionTy, true, true, - 42, 0, false); + llvmDIBuilderCreateFunction(DIB, File, "foo", 3, "foo", 3, File, 42, + FunctionTy, true, true, 42, 0, false); LLVMMetadataReplaceAllUsesWith(ReplaceableFunctionMetadata, FunctionMetadata); LLVMMetadataRef FooParamExpression = - LLVMDIBuilderCreateExpression(DIB, NULL, 0); - LLVMMetadataRef FooParamVar1 = - LLVMDIBuilderCreateParameterVariable(DIB, FunctionMetadata, "a", 1, 1, File, - 42, Int64Ty, true, 0); - LLVMDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), + llvmDIBuilderCreateExpression(DIB, NULL, 0); + LLVMMetadataRef FooParamVar1 = llvmDIBuilderCreateParameterVariable( + DIB, FunctionMetadata, "a", 1, 1, File, 42, Int64Ty, true, 0); + llvmDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), FooParamVar1, FooParamExpression, FooParamLocation, FooEntryBlock); - LLVMMetadataRef FooParamVar2 = - LLVMDIBuilderCreateParameterVariable(DIB, FunctionMetadata, "b", 1, 2, File, - 42, Int64Ty, true, 0); - LLVMDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), + LLVMMetadataRef FooParamVar2 = llvmDIBuilderCreateParameterVariable( + DIB, FunctionMetadata, "b", 1, 2, File, 42, Int64Ty, true, 0); + llvmDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), FooParamVar2, FooParamExpression, FooParamLocation, FooEntryBlock); - LLVMMetadataRef FooParamVar3 = - LLVMDIBuilderCreateParameterVariable(DIB, FunctionMetadata, "c", 1, 3, File, - 42, VectorTy, true, 0); - LLVMDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), + LLVMMetadataRef FooParamVar3 = llvmDIBuilderCreateParameterVariable( + DIB, FunctionMetadata, "c", 1, 3, File, 42, VectorTy, true, 0); + llvmDIBuilderInsertDeclareAtEnd(DIB, LLVMConstInt(LLVMInt64Type(), 0, false), FooParamVar3, FooParamExpression, FooParamLocation, FooEntryBlock); LLVMSetSubprogram(FooFunction, FunctionMetadata); LLVMMetadataRef FooLexicalBlock = - LLVMDIBuilderCreateLexicalBlock(DIB, FunctionMetadata, File, 42, 0); + llvmDIBuilderCreateLexicalBlock(DIB, FunctionMetadata, File, 42, 0); LLVMBasicBlockRef FooVarBlock = LLVMAppendBasicBlock(FooFunction, "vars"); - LLVMMetadataRef FooVarsLocation = - LLVMDIBuilderCreateDebugLocation(LLVMGetGlobalContext(), 43, 0, - FunctionMetadata, NULL); - LLVMMetadataRef FooVar1 = - LLVMDIBuilderCreateAutoVariable(DIB, FooLexicalBlock, "d", 1, File, - 43, Int64Ty, true, 0, 0); + LLVMMetadataRef FooVarsLocation = llvmDIBuilderCreateDebugLocation( + LLVMGetGlobalContext(), 43, 0, FunctionMetadata, NULL); + LLVMMetadataRef FooVar1 = llvmDIBuilderCreateAutoVariable( + DIB, FooLexicalBlock, "d", 1, File, 43, Int64Ty, true, 0, 0); LLVMValueRef FooVal1 = LLVMConstInt(LLVMInt64Type(), 0, false); LLVMMetadataRef FooVarValueExpr = - LLVMDIBuilderCreateConstantValueExpression(DIB, 0); + llvmDIBuilderCreateConstantValueExpression(DIB, 0); - LLVMDIBuilderInsertDbgValueAtEnd(DIB, FooVal1, FooVar1, FooVarValueExpr, + llvmDIBuilderInsertDbgValueAtEnd(DIB, FooVal1, FooVar1, FooVarValueExpr, FooVarsLocation, FooVarBlock); LLVMMetadataRef MacroFile = - LLVMDIBuilderCreateTempMacroFile(DIB, NULL, 0, File); - LLVMDIBuilderCreateMacro(DIB, MacroFile, 0, LLVMDWARFMacinfoRecordTypeDefine, + llvmDIBuilderCreateTempMacroFile(DIB, NULL, 0, File); + llvmDIBuilderCreateMacro(DIB, MacroFile, 0, LLVMDWARFMacinfoRecordTypeDefine, "SIMPLE_DEFINE", 13, NULL, 0); - LLVMDIBuilderCreateMacro(DIB, MacroFile, 0, LLVMDWARFMacinfoRecordTypeDefine, + llvmDIBuilderCreateMacro(DIB, MacroFile, 0, LLVMDWARFMacinfoRecordTypeDefine, "VALUE_DEFINE", 12, "1", 1); LLVMMetadataRef EnumeratorTestA = - LLVMDIBuilderCreateEnumerator(DIB, "Test_A", strlen("Test_A"), 0, true); + llvmDIBuilderCreateEnumerator(DIB, "Test_A", strlen("Test_A"), 0, true); LLVMMetadataRef EnumeratorTestB = - LLVMDIBuilderCreateEnumerator(DIB, "Test_B", strlen("Test_B"), 1, true); + llvmDIBuilderCreateEnumerator(DIB, "Test_B", strlen("Test_B"), 1, true); LLVMMetadataRef EnumeratorTestC = - LLVMDIBuilderCreateEnumerator(DIB, "Test_B", strlen("Test_C"), 2, true); + llvmDIBuilderCreateEnumerator(DIB, "Test_B", strlen("Test_C"), 2, true); LLVMMetadataRef EnumeratorsTest[] = {EnumeratorTestA, EnumeratorTestB, EnumeratorTestC}; - LLVMMetadataRef EnumTest = LLVMDIBuilderCreateEnumerationType( + LLVMMetadataRef EnumTest = llvmDIBuilderCreateEnumerationType( DIB, NameSpace, "EnumTest", strlen("EnumTest"), File, 0, 64, 0, EnumeratorsTest, 3, Int64Ty); LLVMAddNamedMetadataOperand( M, "EnumTest", LLVMMetadataAsValue(LLVMGetModuleContext(M), EnumTest)); - LLVMDIBuilderFinalize(DIB); + llvmDIBuilderFinalize(DIB); char *MStr = LLVMPrintModuleToString(M); puts(MStr);