6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-08 19:25:47 +00:00
Code Issues Projects Releases Wiki Activity

DebugInfo: Remove DIDescriptor from the DIBuilder API

Browse Source 
As a step toward killing `DIDescriptor` and its subclasses, remove it
from the `DIBuilder` API.  Replace the subclasses with appropriate
pointers from the new debug info hierarchy.  There are a couple of
possible surprises in type choices for out-of-tree frontends:

  - Subroutine types: `MDSubroutineType`, not `MDCompositeTypeBase`.
  - Composite types: `MDCompositeType`, not `MDCompositeTypeBase`.
  - Scopes: `MDScope`, not `MDNode`.
  - Generic debug info nodes: `DebugNode`, not `MDNode`.

This is part of PR23080.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235111 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2015-04-16 16:36:23 +00:00
parent e2711530de
commit afc67405f8
5 changed files with 407 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
bindings/go/llvm/DIBuilderBindings.cpp
View File

@@ -58,9 +58,8 @@ LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock(LLVMDIBuilderRef Dref,
unsigned Line, unsigned Line,
unsigned Column) { unsigned Column) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DILexicalBlock LB = auto *LB = D->createLexicalBlock(unwrap<MDLocalScope>(Scope),
D->createLexicalBlock(DIDescriptor(unwrap<MDLocalScope>(Scope)), unwrap<MDFile>(File), Line, Column);
unwrap<MDFile>(File), Line, Column);
return wrap(LB); return wrap(LB);
} }
@@ -69,9 +68,8 @@ LLVMMetadataRef LLVMDIBuilderCreateLexicalBlockFile(LLVMDIBuilderRef Dref,
LLVMMetadataRef File, LLVMMetadataRef File,
unsigned Discriminator) { unsigned Discriminator) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DILexicalBlockFile LBF = DILexicalBlockFile LBF = D->createLexicalBlockFile(
D->createLexicalBlockFile(DIDescriptor(unwrap<MDLocalScope>(Scope)), unwrap<MDLocalScope>(Scope), unwrap<MDFile>(File), Discriminator);
unwrap<MDFile>(File), Discriminator);
return wrap(LBF); return wrap(LBF);
} }
@@ -82,9 +80,9 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
unsigned ScopeLine, unsigned Flags, int IsOptimized, LLVMValueRef Func) { unsigned ScopeLine, unsigned Flags, int IsOptimized, LLVMValueRef Func) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DISubprogram SP = D->createFunction( DISubprogram SP = D->createFunction(
DIDescriptor(unwrap<MDScope>(Scope)), Name, LinkageName, unwrap<MDScope>(Scope), Name, LinkageName,
File ? unwrap<MDFile>(File) : nullptr, Line, File ? unwrap<MDFile>(File) : nullptr, Line,
unwrap<MDCompositeTypeBase>(CompositeType), IsLocalToUnit, IsDefinition, unwrap<MDSubroutineType>(CompositeType), IsLocalToUnit, IsDefinition,
ScopeLine, Flags, IsOptimized, unwrap<Function>(Func)); ScopeLine, Flags, IsOptimized, unwrap<Function>(Func));
return wrap(SP); return wrap(SP);
} }
@@ -95,8 +93,8 @@ LLVMMetadataRef LLVMDIBuilderCreateLocalVariable(
int AlwaysPreserve, unsigned Flags, unsigned ArgNo) { int AlwaysPreserve, unsigned Flags, unsigned ArgNo) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DIVariable V = D->createLocalVariable( DIVariable V = D->createLocalVariable(
Tag, DIDescriptor(unwrap<MDScope>(Scope)), Name, unwrap<MDFile>(File), Tag, unwrap<MDScope>(Scope), Name, unwrap<MDFile>(File), Line,
Line, unwrap<MDType>(Ty), AlwaysPreserve, Flags, ArgNo); unwrap<MDType>(Ty), AlwaysPreserve, Flags, ArgNo);
return wrap(V); return wrap(V);
} }
@@ -138,9 +136,9 @@ LLVMMetadataRef LLVMDIBuilderCreateStructType(
LLVMMetadataRef ElementTypes) { LLVMMetadataRef ElementTypes) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DICompositeType CT = D->createStructType( DICompositeType CT = D->createStructType(
DIDescriptor(unwrap<MDScope>(Scope)), Name, unwrap<MDScope>(Scope), Name, File ? unwrap<MDFile>(File) : nullptr, Line,
File ? unwrap<MDFile>(File) : nullptr, Line, SizeInBits, AlignInBits, SizeInBits, AlignInBits, Flags,
Flags, DerivedFrom ? unwrap<MDType>(DerivedFrom) : nullptr, DerivedFrom ? unwrap<MDType>(DerivedFrom) : nullptr,
ElementTypes ? DIArray(unwrap<MDTuple>(ElementTypes)) : nullptr); ElementTypes ? DIArray(unwrap<MDTuple>(ElementTypes)) : nullptr);
return wrap(CT); return wrap(CT);
} }
@@ -152,9 +150,8 @@ LLVMMetadataRef LLVMDIBuilderCreateReplaceableCompositeType(
unsigned Flags) { unsigned Flags) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DICompositeType CT = D->createReplaceableCompositeType( DICompositeType CT = D->createReplaceableCompositeType(
Tag, Name, DIDescriptor(unwrap<MDScope>(Scope)), Tag, Name, unwrap<MDScope>(Scope), File ? unwrap<MDFile>(File) : nullptr,
File ? unwrap<MDFile>(File) : nullptr, Line, RuntimeLang, SizeInBits, Line, RuntimeLang, SizeInBits, AlignInBits, Flags);
AlignInBits, Flags);
return wrap(CT); return wrap(CT);
} }
@@ -166,9 +163,8 @@ LLVMDIBuilderCreateMemberType(LLVMDIBuilderRef Dref, LLVMMetadataRef Scope,
unsigned Flags, LLVMMetadataRef Ty) { unsigned Flags, LLVMMetadataRef Ty) {
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DIDerivedType DT = D->createMemberType( DIDerivedType DT = D->createMemberType(
DIDescriptor(unwrap<MDScope>(Scope)), Name, unwrap<MDScope>(Scope), Name, File ? unwrap<MDFile>(File) : nullptr, Line,
File ? unwrap<MDFile>(File) : nullptr, Line, SizeInBits, AlignInBits, SizeInBits, AlignInBits, OffsetInBits, Flags, unwrap<MDType>(Ty));
OffsetInBits, Flags, unwrap<MDType>(Ty));
return wrap(DT); return wrap(DT);
} }
@@ -191,7 +187,7 @@ LLVMMetadataRef LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Dref,
DIBuilder *D = unwrap(Dref); DIBuilder *D = unwrap(Dref);
DIDerivedType DT = D->createTypedef( DIDerivedType DT = D->createTypedef(
unwrap<MDType>(Ty), Name, File ? unwrap<MDFile>(File) : nullptr, Line, unwrap<MDType>(Ty), Name, File ? unwrap<MDFile>(File) : nullptr, Line,
Context ? DIDescriptor(unwrap<MDScope>(Context)) : DIDescriptor()); Context ? unwrap<MDScope>(Context) : nullptr);
return wrap(DT); return wrap(DT);
} }

4
examples/Kaleidoscope/Chapter8/toy.cpp
View File

@@ -836,7 +836,7 @@ void DebugInfo::emitLocation(ExprAST *AST) {
DebugLoc::get(AST->getLine(), AST->getCol(), Scope)); DebugLoc::get(AST->getLine(), AST->getCol(), Scope));
} }
static DICompositeType CreateFunctionType(unsigned NumArgs, DIFile Unit) { static MDSubroutineType *CreateFunctionType(unsigned NumArgs, DIFile Unit) {
SmallVector<Metadata *, 8> EltTys; SmallVector<Metadata *, 8> EltTys;
DIType DblTy = KSDbgInfo.getDoubleTy(); DIType DblTy = KSDbgInfo.getDoubleTy();
@@ -1226,7 +1226,7 @@ Function *PrototypeAST::Codegen() {
// Create a subprogram DIE for this function. // Create a subprogram DIE for this function.
DIFile Unit = DBuilder->createFile(KSDbgInfo.TheCU->getFilename(), DIFile Unit = DBuilder->createFile(KSDbgInfo.TheCU->getFilename(),
KSDbgInfo.TheCU->getDirectory()); KSDbgInfo.TheCU->getDirectory());
DIDescriptor FContext = Unit; MDScope *FContext = Unit;
unsigned LineNo = Line; unsigned LineNo = Line;
unsigned ScopeLine = Line; unsigned ScopeLine = Line;
DISubprogram SP = DBuilder->createFunction( DISubprogram SP = DBuilder->createFunction(

399
include/llvm/IR/DIBuilder.h
View File

@@ -30,28 +30,7 @@ namespace llvm {
class Value; class Value;
class Constant; class Constant;
class LLVMContext; class LLVMContext;
class MDNode;
class StringRef; class StringRef;
class DIBasicType;
class DICompileUnit;
class DICompositeType;
class DIDerivedType;
class DIDescriptor;
class DIFile;
class DIEnumerator;
class DIType;
class DIGlobalVariable;
class DIImportedEntity;
class DINameSpace;
class DIVariable;
class DISubrange;
class DILexicalBlockFile;
class DILexicalBlock;
class DIScope;
class DISubprogram;
class DITemplateTypeParameter;
class DITemplateValueParameter;
class DIObjCProperty;
class DIBuilder { class DIBuilder {
Module &M; Module &M;
@@ -125,26 +104,25 @@ namespace llvm {
/// source location information in the back end /// source location information in the back end
/// without actually changing the output (e.g., /// without actually changing the output (e.g.,
/// when using optimization remarks). /// when using optimization remarks).
DICompileUnit createCompileUnit(unsigned Lang, StringRef File, MDCompileUnit *createCompileUnit(unsigned Lang, StringRef File,
StringRef Dir, StringRef Producer, StringRef Dir, StringRef Producer,
bool isOptimized, StringRef Flags, bool isOptimized, StringRef Flags,
unsigned RV, unsigned RV, StringRef SplitName = "",
StringRef SplitName = StringRef(), DebugEmissionKind Kind = FullDebug,
DebugEmissionKind Kind = FullDebug, bool EmitDebugInfo = true);
bool EmitDebugInfo = true);
/// createFile - Create a file descriptor to hold debugging information /// createFile - Create a file descriptor to hold debugging information
/// for a file. /// for a file.
DIFile createFile(StringRef Filename, StringRef Directory); MDFile *createFile(StringRef Filename, StringRef Directory);
/// createEnumerator - Create a single enumerator value. /// createEnumerator - Create a single enumerator value.
DIEnumerator createEnumerator(StringRef Name, int64_t Val); MDEnumerator *createEnumerator(StringRef Name, int64_t Val);
/// \brief Create a DWARF unspecified type. /// \brief Create a DWARF unspecified type.
DIBasicType createUnspecifiedType(StringRef Name); MDBasicType *createUnspecifiedType(StringRef Name);
/// \brief Create C++11 nullptr type. /// \brief Create C++11 nullptr type.
DIBasicType createNullPtrType(); MDBasicType *createNullPtrType();
/// createBasicType - Create debugging information entry for a basic /// createBasicType - Create debugging information entry for a basic
/// type. /// type.
@@ -152,36 +130,36 @@ namespace llvm {
/// @param SizeInBits Size of the type. /// @param SizeInBits Size of the type.
/// @param AlignInBits Type alignment. /// @param AlignInBits Type alignment.
/// @param Encoding DWARF encoding code, e.g. dwarf::DW_ATE_float. /// @param Encoding DWARF encoding code, e.g. dwarf::DW_ATE_float.
DIBasicType createBasicType(StringRef Name, uint64_t SizeInBits, MDBasicType *createBasicType(StringRef Name, uint64_t SizeInBits,
uint64_t AlignInBits, unsigned Encoding); uint64_t AlignInBits, unsigned Encoding);
/// createQualifiedType - Create debugging information entry for a qualified /// createQualifiedType - Create debugging information entry for a qualified
/// type, e.g. 'const int'. /// type, e.g. 'const int'.
/// @param Tag Tag identifing type, e.g. dwarf::TAG_volatile_type /// @param Tag Tag identifing type, e.g. dwarf::TAG_volatile_type
/// @param FromTy Base Type. /// @param FromTy Base Type.
DIDerivedType createQualifiedType(unsigned Tag, DIType FromTy); MDDerivedType *createQualifiedType(unsigned Tag, MDType *FromTy);
/// createPointerType - Create debugging information entry for a pointer. /// createPointerType - Create debugging information entry for a pointer.
/// @param PointeeTy Type pointed by this pointer. /// @param PointeeTy Type pointed by this pointer.
/// @param SizeInBits Size. /// @param SizeInBits Size.
/// @param AlignInBits Alignment. (optional) /// @param AlignInBits Alignment. (optional)
/// @param Name Pointer type name. (optional) /// @param Name Pointer type name. (optional)
DIDerivedType MDDerivedType *createPointerType(MDType *PointeeTy, uint64_t SizeInBits,
createPointerType(DIType PointeeTy, uint64_t SizeInBits, uint64_t AlignInBits = 0,
uint64_t AlignInBits = 0, StringRef Name = StringRef()); StringRef Name = "");
/// \brief Create debugging information entry for a pointer to member. /// \brief Create debugging information entry for a pointer to member.
/// @param PointeeTy Type pointed to by this pointer. /// @param PointeeTy Type pointed to by this pointer.
/// @param SizeInBits Size. /// @param SizeInBits Size.
/// @param AlignInBits Alignment. (optional) /// @param AlignInBits Alignment. (optional)
/// @param Class Type for which this pointer points to members of. /// @param Class Type for which this pointer points to members of.
DIDerivedType createMemberPointerType(DIType PointeeTy, DIType Class, MDDerivedType *createMemberPointerType(MDType *PointeeTy, MDType *Class,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits = 0); uint64_t AlignInBits = 0);
/// createReferenceType - Create debugging information entry for a c++ /// createReferenceType - Create debugging information entry for a c++
/// style reference or rvalue reference type. /// style reference or rvalue reference type.
DIDerivedType createReferenceType(unsigned Tag, DIType RTy); MDDerivedType *createReferenceType(unsigned Tag, MDType *RTy);
/// createTypedef - Create debugging information entry for a typedef. /// createTypedef - Create debugging information entry for a typedef.
/// @param Ty Original type. /// @param Ty Original type.
@@ -189,11 +167,11 @@ namespace llvm {
/// @param File File where this type is defined. /// @param File File where this type is defined.
/// @param LineNo Line number. /// @param LineNo Line number.
/// @param Context The surrounding context for the typedef. /// @param Context The surrounding context for the typedef.
DIDerivedType createTypedef(DIType Ty, StringRef Name, DIFile File, MDDerivedType *createTypedef(MDType *Ty, StringRef Name, MDFile *File,
unsigned LineNo, DIDescriptor Context); unsigned LineNo, MDScope *Context);
/// createFriend - Create debugging information entry for a 'friend'. /// createFriend - Create debugging information entry for a 'friend'.
DIDerivedType createFriend(DIType Ty, DIType FriendTy); MDDerivedType *createFriend(MDType *Ty, MDType *FriendTy);
/// createInheritance - Create debugging information entry to establish /// createInheritance - Create debugging information entry to establish
/// inheritance relationship between two types. /// inheritance relationship between two types.
@@ -202,8 +180,8 @@ namespace llvm {
/// @param BaseOffset Base offset. /// @param BaseOffset Base offset.
/// @param Flags Flags to describe inheritance attribute, /// @param Flags Flags to describe inheritance attribute,
/// e.g. private /// e.g. private
DIDerivedType createInheritance(DIType Ty, DIType BaseTy, MDDerivedType *createInheritance(MDType *Ty, MDType *BaseTy,
uint64_t BaseOffset, unsigned Flags); uint64_t BaseOffset, unsigned Flags);
/// createMemberType - Create debugging information entry for a member. /// createMemberType - Create debugging information entry for a member.
/// @param Scope Member scope. /// @param Scope Member scope.
@@ -215,10 +193,11 @@ namespace llvm {
/// @param OffsetInBits Member offset. /// @param OffsetInBits Member offset.
/// @param Flags Flags to encode member attribute, e.g. private /// @param Flags Flags to encode member attribute, e.g. private
/// @param Ty Parent type. /// @param Ty Parent type.
DIDerivedType MDDerivedType *createMemberType(MDScope *Scope, StringRef Name,
createMemberType(DIDescriptor Scope, StringRef Name, DIFile File, MDFile *File, unsigned LineNo,
unsigned LineNo, uint64_t SizeInBits, uint64_t AlignInBits, uint64_t SizeInBits, uint64_t AlignInBits,
uint64_t OffsetInBits, unsigned Flags, DIType Ty); uint64_t OffsetInBits, unsigned Flags,
MDType *Ty);
/// createStaticMemberType - Create debugging information entry for a /// createStaticMemberType - Create debugging information entry for a
/// C++ static data member. /// C++ static data member.
@@ -229,10 +208,10 @@ namespace llvm {
/// @param Ty Type of the static member. /// @param Ty Type of the static member.
/// @param Flags Flags to encode member attribute, e.g. private. /// @param Flags Flags to encode member attribute, e.g. private.
/// @param Val Const initializer of the member. /// @param Val Const initializer of the member.
DIDerivedType createStaticMemberType(DIDescriptor Scope, StringRef Name, MDDerivedType *createStaticMemberType(MDScope *Scope, StringRef Name,
DIFile File, unsigned LineNo, MDFile *File, unsigned LineNo,
DIType Ty, unsigned Flags, MDType *Ty, unsigned Flags,
llvm::Constant *Val); llvm::Constant *Val);
/// createObjCIVar - Create debugging information entry for Objective-C /// createObjCIVar - Create debugging information entry for Objective-C
/// instance variable. /// instance variable.
@@ -245,11 +224,10 @@ namespace llvm {
/// @param Flags Flags to encode member attribute, e.g. private /// @param Flags Flags to encode member attribute, e.g. private
/// @param Ty Parent type. /// @param Ty Parent type.
/// @param PropertyNode Property associated with this ivar. /// @param PropertyNode Property associated with this ivar.
DIDerivedType createObjCIVar(StringRef Name, DIFile File, MDDerivedType *createObjCIVar(StringRef Name, MDFile *File, unsigned LineNo,
unsigned LineNo, uint64_t SizeInBits, uint64_t SizeInBits, uint64_t AlignInBits,
uint64_t AlignInBits, uint64_t OffsetInBits, uint64_t OffsetInBits, unsigned Flags,
unsigned Flags, DIType Ty, MDType *Ty, MDNode *PropertyNode);
MDNode *PropertyNode);
/// createObjCProperty - Create debugging information entry for Objective-C /// createObjCProperty - Create debugging information entry for Objective-C
/// property. /// property.
@@ -260,12 +238,11 @@ namespace llvm {
/// @param SetterName Name of the Objective C property setter selector. /// @param SetterName Name of the Objective C property setter selector.
/// @param PropertyAttributes Objective C property attributes. /// @param PropertyAttributes Objective C property attributes.
/// @param Ty Type. /// @param Ty Type.
DIObjCProperty createObjCProperty(StringRef Name, MDObjCProperty *createObjCProperty(StringRef Name, MDFile *File,
DIFile File, unsigned LineNumber, unsigned LineNumber,
StringRef GetterName, StringRef GetterName,
StringRef SetterName, StringRef SetterName,
unsigned PropertyAttributes, unsigned PropertyAttributes, MDType *Ty);
DIType Ty);
/// createClassType - Create debugging information entry for a class. /// createClassType - Create debugging information entry for a class.
/// @param Scope Scope in which this class is defined. /// @param Scope Scope in which this class is defined.
@@ -283,14 +260,14 @@ namespace llvm {
/// for more info. /// for more info.
/// @param TemplateParms Template type parameters. /// @param TemplateParms Template type parameters.
/// @param UniqueIdentifier A unique identifier for the class. /// @param UniqueIdentifier A unique identifier for the class.
DICompositeType createClassType(DIDescriptor Scope, StringRef Name, MDCompositeType *createClassType(MDScope *Scope, StringRef Name,
DIFile File, unsigned LineNumber, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t AlignInBits, uint64_t SizeInBits, uint64_t AlignInBits,
uint64_t OffsetInBits, unsigned Flags, uint64_t OffsetInBits, unsigned Flags,
DIType DerivedFrom, DIArray Elements, MDType *DerivedFrom, DIArray Elements,
DIType VTableHolder = DIType(), MDType *VTableHolder = nullptr,
MDNode *TemplateParms = nullptr, MDNode *TemplateParms = nullptr,
StringRef UniqueIdentifier = StringRef()); StringRef UniqueIdentifier = "");
/// createStructType - Create debugging information entry for a struct. /// createStructType - Create debugging information entry for a struct.
/// @param Scope Scope in which this struct is defined. /// @param Scope Scope in which this struct is defined.
@@ -303,13 +280,11 @@ namespace llvm {
/// @param Elements Struct elements. /// @param Elements Struct elements.
/// @param RunTimeLang Optional parameter, Objective-C runtime version. /// @param RunTimeLang Optional parameter, Objective-C runtime version.
/// @param UniqueIdentifier A unique identifier for the struct. /// @param UniqueIdentifier A unique identifier for the struct.
DICompositeType createStructType(DIDescriptor Scope, StringRef Name, MDCompositeType *createStructType(
DIFile File, unsigned LineNumber, MDScope *Scope, StringRef Name, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t AlignInBits, uint64_t SizeInBits, uint64_t AlignInBits, unsigned Flags,
unsigned Flags, DIType DerivedFrom, MDType *DerivedFrom, DIArray Elements, unsigned RunTimeLang = 0,
DIArray Elements, unsigned RunTimeLang = 0, MDType *VTableHolder = nullptr, StringRef UniqueIdentifier = "");
DIType VTableHolder = DIType(),
StringRef UniqueIdentifier = StringRef());
/// createUnionType - Create debugging information entry for an union. /// createUnionType - Create debugging information entry for an union.
/// @param Scope Scope in which this union is defined. /// @param Scope Scope in which this union is defined.
@@ -322,19 +297,20 @@ namespace llvm {
/// @param Elements Union elements. /// @param Elements Union elements.
/// @param RunTimeLang Optional parameter, Objective-C runtime version. /// @param RunTimeLang Optional parameter, Objective-C runtime version.
/// @param UniqueIdentifier A unique identifier for the union. /// @param UniqueIdentifier A unique identifier for the union.
DICompositeType createUnionType( MDCompositeType *createUnionType(MDScope *Scope, StringRef Name,
DIDescriptor Scope, StringRef Name, DIFile File, unsigned LineNumber, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t AlignInBits, unsigned Flags, uint64_t SizeInBits, uint64_t AlignInBits,
DIArray Elements, unsigned RunTimeLang = 0, unsigned Flags, DIArray Elements,
StringRef UniqueIdentifier = StringRef()); unsigned RunTimeLang = 0,
StringRef UniqueIdentifier = "");
/// createTemplateTypeParameter - Create debugging information for template /// createTemplateTypeParameter - Create debugging information for template
/// type parameter. /// type parameter.
/// @param Scope Scope in which this type is defined. /// @param Scope Scope in which this type is defined.
/// @param Name Type parameter name. /// @param Name Type parameter name.
/// @param Ty Parameter type. /// @param Ty Parameter type.
DITemplateTypeParameter MDTemplateTypeParameter *
createTemplateTypeParameter(DIDescriptor Scope, StringRef Name, DIType Ty); createTemplateTypeParameter(MDScope *Scope, StringRef Name, MDType *Ty);
/// createTemplateValueParameter - Create debugging information for template /// createTemplateValueParameter - Create debugging information for template
/// value parameter. /// value parameter.
@@ -342,46 +318,46 @@ namespace llvm {
/// @param Name Value parameter name. /// @param Name Value parameter name.
/// @param Ty Parameter type. /// @param Ty Parameter type.
/// @param Val Constant parameter value. /// @param Val Constant parameter value.
DITemplateValueParameter createTemplateValueParameter(DIDescriptor Scope, MDTemplateValueParameter *createTemplateValueParameter(MDScope *Scope,
StringRef Name, StringRef Name,
DIType Ty, MDType *Ty,
Constant *Val); Constant *Val);
/// \brief Create debugging information for a template template parameter. /// \brief Create debugging information for a template template parameter.
/// @param Scope Scope in which this type is defined. /// @param Scope Scope in which this type is defined.
/// @param Name Value parameter name. /// @param Name Value parameter name.
/// @param Ty Parameter type. /// @param Ty Parameter type.
/// @param Val The fully qualified name of the template. /// @param Val The fully qualified name of the template.
DITemplateValueParameter createTemplateTemplateParameter(DIDescriptor Scope, MDTemplateValueParameter *createTemplateTemplateParameter(MDScope *Scope,
StringRef Name, StringRef Name,
DIType Ty, MDType *Ty,
StringRef Val); StringRef Val);
/// \brief Create debugging information for a template parameter pack. /// \brief Create debugging information for a template parameter pack.
/// @param Scope Scope in which this type is defined. /// @param Scope Scope in which this type is defined.
/// @param Name Value parameter name. /// @param Name Value parameter name.
/// @param Ty Parameter type. /// @param Ty Parameter type.
/// @param Val An array of types in the pack. /// @param Val An array of types in the pack.
DITemplateValueParameter createTemplateParameterPack(DIDescriptor Scope, MDTemplateValueParameter *createTemplateParameterPack(MDScope *Scope,
StringRef Name, StringRef Name,
DIType Ty, MDType *Ty,
DIArray Val); DIArray Val);
/// createArrayType - Create debugging information entry for an array. /// createArrayType - Create debugging information entry for an array.
/// @param Size Array size. /// @param Size Array size.
/// @param AlignInBits Alignment. /// @param AlignInBits Alignment.
/// @param Ty Element type. /// @param Ty Element type.
/// @param Subscripts Subscripts. /// @param Subscripts Subscripts.
DICompositeType createArrayType(uint64_t Size, uint64_t AlignInBits, MDCompositeType *createArrayType(uint64_t Size, uint64_t AlignInBits,
DIType Ty, DIArray Subscripts); MDType *Ty, DIArray Subscripts);
/// createVectorType - Create debugging information entry for a vector type. /// createVectorType - Create debugging information entry for a vector type.
/// @param Size Array size. /// @param Size Array size.
/// @param AlignInBits Alignment. /// @param AlignInBits Alignment.
/// @param Ty Element type. /// @param Ty Element type.
/// @param Subscripts Subscripts. /// @param Subscripts Subscripts.
DICompositeType createVectorType(uint64_t Size, uint64_t AlignInBits, MDCompositeType *createVectorType(uint64_t Size, uint64_t AlignInBits,
DIType Ty, DIArray Subscripts); MDType *Ty, DIArray Subscripts);
/// createEnumerationType - Create debugging information entry for an /// createEnumerationType - Create debugging information entry for an
/// enumeration. /// enumeration.
@@ -394,10 +370,10 @@ namespace llvm {
/// @param Elements Enumeration elements. /// @param Elements Enumeration elements.
/// @param UnderlyingType Underlying type of a C++11/ObjC fixed enum. /// @param UnderlyingType Underlying type of a C++11/ObjC fixed enum.
/// @param UniqueIdentifier A unique identifier for the enum. /// @param UniqueIdentifier A unique identifier for the enum.
DICompositeType createEnumerationType(DIDescriptor Scope, StringRef Name, MDCompositeType *createEnumerationType(
DIFile File, unsigned LineNumber, uint64_t SizeInBits, MDScope *Scope, StringRef Name, MDFile *File, unsigned LineNumber,
uint64_t AlignInBits, DIArray Elements, DIType UnderlyingType, uint64_t SizeInBits, uint64_t AlignInBits, DIArray Elements,
StringRef UniqueIdentifier = StringRef()); MDType *UnderlyingType, StringRef UniqueIdentifier = "");
/// createSubroutineType - Create subroutine type. /// createSubroutineType - Create subroutine type.
/// @param File File in which this subroutine is defined. /// @param File File in which this subroutine is defined.
@@ -405,39 +381,39 @@ namespace llvm {
/// includes return type at 0th index. /// includes return type at 0th index.
/// @param Flags E.g.: LValueReference. /// @param Flags E.g.: LValueReference.
/// These flags are used to emit dwarf attributes. /// These flags are used to emit dwarf attributes.
DISubroutineType createSubroutineType(DIFile File, MDSubroutineType *createSubroutineType(MDFile *File,
DITypeArray ParameterTypes, DITypeArray ParameterTypes,
unsigned Flags = 0); unsigned Flags = 0);
/// createArtificialType - Create a new DIType with "artificial" flag set. /// createArtificialType - Create a new MDType* with "artificial" flag set.
DIType createArtificialType(DIType Ty); MDType *createArtificialType(MDType *Ty);
/// createObjectPointerType - Create a new DIType with the "object pointer" /// createObjectPointerType - Create a new MDType* with the "object pointer"
/// flag set. /// flag set.
DIType createObjectPointerType(DIType Ty); MDType *createObjectPointerType(MDType *Ty);
/// \brief Create a permanent forward-declared type. /// \brief Create a permanent forward-declared type.
DICompositeType createForwardDecl(unsigned Tag, StringRef Name, MDCompositeType *createForwardDecl(unsigned Tag, StringRef Name,
DIDescriptor Scope, DIFile F, MDScope *Scope, MDFile *F, unsigned Line,
unsigned Line, unsigned RuntimeLang = 0, unsigned RuntimeLang = 0,
uint64_t SizeInBits = 0, uint64_t SizeInBits = 0,
uint64_t AlignInBits = 0, uint64_t AlignInBits = 0,
StringRef UniqueIdentifier = StringRef()); StringRef UniqueIdentifier = "");
/// \brief Create a temporary forward-declared type. /// \brief Create a temporary forward-declared type.
DICompositeType createReplaceableCompositeType( MDCompositeType *createReplaceableCompositeType(
unsigned Tag, StringRef Name, DIDescriptor Scope, DIFile F, unsigned Tag, StringRef Name, MDScope *Scope, MDFile *F, unsigned Line,
unsigned Line, unsigned RuntimeLang = 0, uint64_t SizeInBits = 0, unsigned RuntimeLang = 0, uint64_t SizeInBits = 0,
uint64_t AlignInBits = 0, unsigned Flags = DebugNode::FlagFwdDecl, uint64_t AlignInBits = 0, unsigned Flags = DebugNode::FlagFwdDecl,
StringRef UniqueIdentifier = StringRef()); StringRef UniqueIdentifier = "");
/// retainType - Retain DIType in a module even if it is not referenced /// retainType - Retain MDType* in a module even if it is not referenced
/// through debug info anchors. /// through debug info anchors.
void retainType(DIType T); void retainType(MDType *T);
/// createUnspecifiedParameter - Create unspecified parameter type /// createUnspecifiedParameter - Create unspecified parameter type
/// for a subroutine type. /// for a subroutine type.
DIBasicType createUnspecifiedParameter(); MDBasicType *createUnspecifiedParameter();
/// getOrCreateArray - Get a DIArray, create one if required. /// getOrCreateArray - Get a DIArray, create one if required.
DIArray getOrCreateArray(ArrayRef<Metadata *> Elements); DIArray getOrCreateArray(ArrayRef<Metadata *> Elements);
@@ -447,8 +423,7 @@ namespace llvm {
/// getOrCreateSubrange - Create a descriptor for a value range. This /// getOrCreateSubrange - Create a descriptor for a value range. This
/// implicitly uniques the values returned. /// implicitly uniques the values returned.
DISubrange getOrCreateSubrange(int64_t Lo, int64_t Count); MDSubrange *getOrCreateSubrange(int64_t Lo, int64_t Count);
/// createGlobalVariable - Create a new descriptor for the specified /// createGlobalVariable - Create a new descriptor for the specified
/// variable. /// variable.
@@ -462,19 +437,19 @@ namespace llvm {
/// externally visible or not. /// externally visible or not.
/// @param Val llvm::Value of the variable. /// @param Val llvm::Value of the variable.
/// @param Decl Reference to the corresponding declaration. /// @param Decl Reference to the corresponding declaration.
DIGlobalVariable createGlobalVariable(DIDescriptor Context, StringRef Name, MDGlobalVariable *createGlobalVariable(MDScope *Context, StringRef Name,
StringRef LinkageName, DIFile File, StringRef LinkageName, MDFile *File,
unsigned LineNo, DIType Ty, unsigned LineNo, MDType *Ty,
bool isLocalToUnit, bool isLocalToUnit,
llvm::Constant *Val, llvm::Constant *Val,
MDNode *Decl = nullptr); MDNode *Decl = nullptr);
/// createTempGlobalVariableFwdDecl - Identical to createGlobalVariable /// createTempGlobalVariableFwdDecl - Identical to createGlobalVariable
/// except that the resulting DbgNode is temporary and meant to be RAUWed. /// except that the resulting DbgNode is temporary and meant to be RAUWed.
DIGlobalVariable createTempGlobalVariableFwdDecl( MDGlobalVariable *createTempGlobalVariableFwdDecl(
DIDescriptor Context, StringRef Name, StringRef LinkageName, MDScope *Context, StringRef Name, StringRef LinkageName, MDFile *File,
DIFile File, unsigned LineNo, DIType Ty, bool isLocalToUnit, unsigned LineNo, MDType *Ty, bool isLocalToUnit, llvm::Constant *Val,
llvm::Constant *Val, MDNode *Decl = nullptr); MDNode *Decl = nullptr);
/// createLocalVariable - Create a new descriptor for the specified /// createLocalVariable - Create a new descriptor for the specified
/// local variable. /// local variable.
@@ -490,27 +465,29 @@ namespace llvm {
/// @param Flags Flags, e.g. artificial variable. /// @param Flags Flags, e.g. artificial variable.
/// @param ArgNo If this variable is an argument then this argument's /// @param ArgNo If this variable is an argument then this argument's
/// number. 1 indicates 1st argument. /// number. 1 indicates 1st argument.
DIVariable createLocalVariable(unsigned Tag, DIDescriptor Scope, MDLocalVariable *createLocalVariable(unsigned Tag, MDScope *Scope,
StringRef Name, DIFile File, unsigned LineNo, StringRef Name, MDFile *File,
DIType Ty, bool AlwaysPreserve = false, unsigned LineNo, MDType *Ty,
unsigned Flags = 0, unsigned ArgNo = 0); bool AlwaysPreserve = false,
unsigned Flags = 0,
unsigned ArgNo = 0);
/// createExpression - Create a new descriptor for the specified /// createExpression - Create a new descriptor for the specified
/// variable which has a complex address expression for its address. /// variable which has a complex address expression for its address.
/// @param Addr An array of complex address operations. /// @param Addr An array of complex address operations.
DIExpression createExpression(ArrayRef<uint64_t> Addr = None); MDExpression *createExpression(ArrayRef<uint64_t> Addr = None);
DIExpression createExpression(ArrayRef<int64_t> Addr); MDExpression *createExpression(ArrayRef<int64_t> Addr);
/// createBitPieceExpression - Create a descriptor to describe one part /// createBitPieceExpression - Create a descriptor to describe one part
/// of aggregate variable that is fragmented across multiple Values. /// of aggregate variable that is fragmented across multiple Values.
/// ///
/// @param OffsetInBits Offset of the piece in bits. /// @param OffsetInBits Offset of the piece in bits.
/// @param SizeInBits Size of the piece in bits. /// @param SizeInBits Size of the piece in bits.
DIExpression createBitPieceExpression(unsigned OffsetInBits, MDExpression *createBitPieceExpression(unsigned OffsetInBits,
unsigned SizeInBits); unsigned SizeInBits);
/// createFunction - Create a new descriptor for the specified subprogram. /// createFunction - Create a new descriptor for the specified subprogram.
/// See comments in DISubprogram for descriptions of these fields. /// See comments in MDSubprogram* for descriptions of these fields.
/// @param Scope Function scope. /// @param Scope Function scope.
/// @param Name Function name. /// @param Name Function name.
/// @param LinkageName Mangled function name. /// @param LinkageName Mangled function name.
@@ -525,49 +502,35 @@ namespace llvm {
/// @param isOptimized True if optimization is ON. /// @param isOptimized True if optimization is ON.
/// @param Fn llvm::Function pointer. /// @param Fn llvm::Function pointer.
/// @param TParam Function template parameters. /// @param TParam Function template parameters.
DISubprogram createFunction(DIDescriptor Scope, StringRef Name, MDSubprogram *
StringRef LinkageName, createFunction(MDScope *Scope, StringRef Name, StringRef LinkageName,
DIFile File, unsigned LineNo, MDFile *File, unsigned LineNo, MDSubroutineType *Ty,
DICompositeType Ty, bool isLocalToUnit, bool isLocalToUnit, bool isDefinition, unsigned ScopeLine,
bool isDefinition, unsigned Flags = 0, bool isOptimized = false,
unsigned ScopeLine, Function *Fn = nullptr, MDNode *TParam = nullptr,
unsigned Flags = 0, MDNode *Decl = nullptr);
bool isOptimized = false,
Function *Fn = nullptr,
MDNode *TParam = nullptr,
MDNode *Decl = nullptr);
/// createTempFunctionFwdDecl - Identical to createFunction, /// createTempFunctionFwdDecl - Identical to createFunction,
/// except that the resulting DbgNode is meant to be RAUWed. /// except that the resulting DbgNode is meant to be RAUWed.
DISubprogram createTempFunctionFwdDecl(DIDescriptor Scope, StringRef Name, MDSubprogram *createTempFunctionFwdDecl(
StringRef LinkageName, MDScope *Scope, StringRef Name, StringRef LinkageName, MDFile *File,
DIFile File, unsigned LineNo, unsigned LineNo, MDSubroutineType *Ty, bool isLocalToUnit,
DICompositeType Ty, bool isLocalToUnit, bool isDefinition, unsigned ScopeLine, unsigned Flags = 0,
bool isDefinition, bool isOptimized = false, Function *Fn = nullptr,
unsigned ScopeLine, MDNode *TParam = nullptr, MDNode *Decl = nullptr);
unsigned Flags = 0,
bool isOptimized = false,
Function *Fn = nullptr,
MDNode *TParam = nullptr,
MDNode *Decl = nullptr);
/// FIXME: this is added for dragonegg. Once we update dragonegg /// FIXME: this is added for dragonegg. Once we update dragonegg
/// to call resolve function, this will be removed. /// to call resolve function, this will be removed.
DISubprogram createFunction(DIScopeRef Scope, StringRef Name, MDSubprogram *
StringRef LinkageName, createFunction(DIScopeRef Scope, StringRef Name, StringRef LinkageName,
DIFile File, unsigned LineNo, MDFile *File, unsigned LineNo, MDSubroutineType *Ty,
DICompositeType Ty, bool isLocalToUnit, bool isLocalToUnit, bool isDefinition, unsigned ScopeLine,
bool isDefinition, unsigned Flags = 0, bool isOptimized = false,
unsigned ScopeLine, Function *Fn = nullptr, MDNode *TParam = nullptr,
unsigned Flags = 0, MDNode *Decl = nullptr);
bool isOptimized = false,
Function *Fn = nullptr,
MDNode *TParam = nullptr,
MDNode *Decl = nullptr);
/// createMethod - Create a new descriptor for the specified C++ method. /// createMethod - Create a new descriptor for the specified C++ method.
/// See comments in DISubprogram for descriptions of these fields. /// See comments in MDSubprogram* for descriptions of these fields.
/// @param Scope Function scope. /// @param Scope Function scope.
/// @param Name Function name. /// @param Name Function name.
/// @param LinkageName Mangled function name. /// @param LinkageName Mangled function name.
@@ -585,17 +548,13 @@ namespace llvm {
/// @param isOptimized True if optimization is ON. /// @param isOptimized True if optimization is ON.
/// @param Fn llvm::Function pointer. /// @param Fn llvm::Function pointer.
/// @param TParam Function template parameters. /// @param TParam Function template parameters.
DISubprogram createMethod(DIDescriptor Scope, StringRef Name, MDSubprogram *
StringRef LinkageName, createMethod(MDScope *Scope, StringRef Name, StringRef LinkageName,
DIFile File, unsigned LineNo, MDFile *File, unsigned LineNo, MDSubroutineType *Ty,
DICompositeType Ty, bool isLocalToUnit, bool isLocalToUnit, bool isDefinition, unsigned Virtuality = 0,
bool isDefinition, unsigned VTableIndex = 0, MDType *VTableHolder = nullptr,
unsigned Virtuality = 0, unsigned VTableIndex = 0, unsigned Flags = 0, bool isOptimized = false,
DIType VTableHolder = DIType(), Function *Fn = nullptr, MDNode *TParam = nullptr);
unsigned Flags = 0,
bool isOptimized = false,
Function *Fn = nullptr,
MDNode *TParam = nullptr);
/// createNameSpace - This creates new descriptor for a namespace /// createNameSpace - This creates new descriptor for a namespace
/// with the specified parent scope. /// with the specified parent scope.
@@ -603,9 +562,8 @@ namespace llvm {
/// @param Name Name of this namespace /// @param Name Name of this namespace
/// @param File Source file /// @param File Source file
/// @param LineNo Line number /// @param LineNo Line number
DINameSpace createNameSpace(DIDescriptor Scope, StringRef Name, MDNamespace *createNameSpace(MDScope *Scope, StringRef Name, MDFile *File,
DIFile File, unsigned LineNo); unsigned LineNo);
/// createLexicalBlockFile - This creates a descriptor for a lexical /// createLexicalBlockFile - This creates a descriptor for a lexical
/// block with a new file attached. This merely extends the existing /// block with a new file attached. This merely extends the existing
@@ -613,8 +571,8 @@ namespace llvm {
/// @param Scope Lexical block. /// @param Scope Lexical block.
/// @param File Source file. /// @param File Source file.
/// @param Discriminator DWARF path discriminator value. /// @param Discriminator DWARF path discriminator value.
DILexicalBlockFile createLexicalBlockFile(DIDescriptor Scope, DIFile File, MDLexicalBlockFile *createLexicalBlockFile(MDScope *Scope, MDFile *File,
unsigned Discriminator = 0); unsigned Discriminator = 0);
/// createLexicalBlock - This creates a descriptor for a lexical block /// createLexicalBlock - This creates a descriptor for a lexical block
/// with the specified parent context. /// with the specified parent context.
@@ -622,35 +580,31 @@ namespace llvm {
/// @param File Source file. /// @param File Source file.
/// @param Line Line number. /// @param Line Line number.
/// @param Col Column number. /// @param Col Column number.
DILexicalBlock createLexicalBlock(DIDescriptor Scope, DIFile File, MDLexicalBlock *createLexicalBlock(MDScope *Scope, MDFile *File,
unsigned Line, unsigned Col); unsigned Line, unsigned Col);
/// \brief Create a descriptor for an imported module. /// \brief Create a descriptor for an imported module.
/// @param Context The scope this module is imported into /// @param Context The scope this module is imported into
/// @param NS The namespace being imported here /// @param NS The namespace being imported here
/// @param Line Line number /// @param Line Line number
DIImportedEntity createImportedModule(DIScope Context, DINameSpace NS, MDImportedEntity *createImportedModule(MDScope *Context, MDNamespace *NS,
unsigned Line); unsigned Line);
/// \brief Create a descriptor for an imported module. /// \brief Create a descriptor for an imported module.
/// @param Context The scope this module is imported into /// @param Context The scope this module is imported into
/// @param NS An aliased namespace /// @param NS An aliased namespace
/// @param Line Line number /// @param Line Line number
DIImportedEntity createImportedModule(DIScope Context, DIImportedEntity NS, MDImportedEntity *createImportedModule(MDScope *Context,
unsigned Line); MDImportedEntity *NS, unsigned Line);
/// \brief Create a descriptor for an imported function. /// \brief Create a descriptor for an imported function.
/// @param Context The scope this module is imported into /// @param Context The scope this module is imported into
/// @param Decl The declaration (or definition) of a function, type, or /// @param Decl The declaration (or definition) of a function, type, or
/// variable /// variable
/// @param Line Line number /// @param Line Line number
DIImportedEntity createImportedDeclaration(DIScope Context, DIDescriptor Decl, MDImportedEntity *createImportedDeclaration(MDScope *Context,
unsigned Line, DebugNode *Decl, unsigned Line,
StringRef Name = StringRef()); StringRef Name = "");
DIImportedEntity createImportedDeclaration(DIScope Context,
DIImportedEntity NS,
unsigned Line,
StringRef Name = StringRef());
/// insertDeclare - Insert a new llvm.dbg.declare intrinsic call. /// insertDeclare - Insert a new llvm.dbg.declare intrinsic call.
/// @param Storage llvm::Value of the variable /// @param Storage llvm::Value of the variable
@@ -658,8 +612,8 @@ namespace llvm {
/// @param Expr A complex location expression. /// @param Expr A complex location expression.
/// @param DL Debug info location. /// @param DL Debug info location.
/// @param InsertAtEnd Location for the new intrinsic. /// @param InsertAtEnd Location for the new intrinsic.
Instruction *insertDeclare(llvm::Value *Storage, DIVariable VarInfo, Instruction *insertDeclare(llvm::Value *Storage, MDLocalVariable *VarInfo,
DIExpression Expr, const MDLocation *DL, MDExpression *Expr, const MDLocation *DL,
BasicBlock *InsertAtEnd); BasicBlock *InsertAtEnd);
/// insertDeclare - Insert a new llvm.dbg.declare intrinsic call. /// insertDeclare - Insert a new llvm.dbg.declare intrinsic call.
@@ -668,8 +622,8 @@ namespace llvm {
/// @param Expr A complex location expression. /// @param Expr A complex location expression.
/// @param DL Debug info location. /// @param DL Debug info location.
/// @param InsertBefore Location for the new intrinsic. /// @param InsertBefore Location for the new intrinsic.
Instruction *insertDeclare(llvm::Value *Storage, DIVariable VarInfo, Instruction *insertDeclare(llvm::Value *Storage, MDLocalVariable *VarInfo,
DIExpression Expr, const MDLocation *DL, MDExpression *Expr, const MDLocation *DL,
Instruction *InsertBefore); Instruction *InsertBefore);
/// insertDbgValueIntrinsic - Insert a new llvm.dbg.value intrinsic call. /// insertDbgValueIntrinsic - Insert a new llvm.dbg.value intrinsic call.
@@ -680,7 +634,8 @@ namespace llvm {
/// @param DL Debug info location. /// @param DL Debug info location.
/// @param InsertAtEnd Location for the new intrinsic. /// @param InsertAtEnd Location for the new intrinsic.
Instruction *insertDbgValueIntrinsic(llvm::Value *Val, uint64_t Offset, Instruction *insertDbgValueIntrinsic(llvm::Value *Val, uint64_t Offset,
DIVariable VarInfo, DIExpression Expr, MDLocalVariable *VarInfo,
MDExpression *Expr,
const MDLocation *DL, const MDLocation *DL,
BasicBlock *InsertAtEnd); BasicBlock *InsertAtEnd);
@@ -692,7 +647,8 @@ namespace llvm {
/// @param DL Debug info location. /// @param DL Debug info location.
/// @param InsertBefore Location for the new intrinsic. /// @param InsertBefore Location for the new intrinsic.
Instruction *insertDbgValueIntrinsic(llvm::Value *Val, uint64_t Offset, Instruction *insertDbgValueIntrinsic(llvm::Value *Val, uint64_t Offset,
DIVariable VarInfo, DIExpression Expr, MDLocalVariable *VarInfo,
MDExpression *Expr,
const MDLocation *DL, const MDLocation *DL,
Instruction *InsertBefore); Instruction *InsertBefore);
@@ -700,14 +656,15 @@ namespace llvm {
/// ///
/// If this creates a self reference, it may orphan some unresolved cycles /// If this creates a self reference, it may orphan some unresolved cycles
/// in the operands of \c T, so \a DIBuilder needs to track that. /// in the operands of \c T, so \a DIBuilder needs to track that.
void replaceVTableHolder(DICompositeType &T, DICompositeType VTableHolder); void replaceVTableHolder(MDCompositeType *&T,
MDCompositeType *VTableHolder);
/// \brief Replace arrays on a composite type. /// \brief Replace arrays on a composite type.
/// ///
/// If \c T is resolved, but the arrays aren't -- which can happen if \c T /// If \c T is resolved, but the arrays aren't -- which can happen if \c T
/// has a self-reference -- \a DIBuilder needs to track the array to /// has a self-reference -- \a DIBuilder needs to track the array to
/// resolve cycles. /// resolve cycles.
void replaceArrays(DICompositeType &T, DIArray Elements, void replaceArrays(MDCompositeType *&T, DIArray Elements,
DIArray TParems = DIArray()); DIArray TParems = DIArray());
/// \brief Replace a temporary node. /// \brief Replace a temporary node.

450
lib/IR/DIBuilder.cpp
View File

@@ -74,8 +74,7 @@ void DIBuilder::trackIfUnresolved(MDNode *N) {
} }
void DIBuilder::finalize() { void DIBuilder::finalize() {
DIArray Enums = getOrCreateArray(AllEnumTypes); TempEnumTypes->replaceAllUsesWith(MDTuple::get(VMContext, AllEnumTypes));
TempEnumTypes->replaceAllUsesWith(Enums.get());
SmallVector<Metadata *, 16> RetainValues; SmallVector<Metadata *, 16> RetainValues;
// Declarations and definitions of the same type may be retained. Some // Declarations and definitions of the same type may be retained. Some
@@ -86,13 +85,11 @@ void DIBuilder::finalize() {
for (unsigned I = 0, E = AllRetainTypes.size(); I < E; I++) for (unsigned I = 0, E = AllRetainTypes.size(); I < E; I++)
if (RetainSet.insert(AllRetainTypes[I]).second) if (RetainSet.insert(AllRetainTypes[I]).second)
RetainValues.push_back(AllRetainTypes[I]); RetainValues.push_back(AllRetainTypes[I]);
DIArray RetainTypes = getOrCreateArray(RetainValues); TempRetainTypes->replaceAllUsesWith(MDTuple::get(VMContext, RetainValues));
TempRetainTypes->replaceAllUsesWith(RetainTypes.get());
DIArray SPs = getOrCreateArray(AllSubprograms); MDSubprogramArray SPs = MDTuple::get(VMContext, AllSubprograms);
TempSubprograms->replaceAllUsesWith(SPs.get()); TempSubprograms->replaceAllUsesWith(SPs.get());
for (unsigned i = 0, e = SPs.size(); i != e; ++i) { for (auto *SP : SPs) {
DISubprogram SP = cast<MDSubprogram>(SPs[i]);
if (MDTuple *Temp = SP->getVariables().get()) { if (MDTuple *Temp = SP->getVariables().get()) {
const auto &PV = PreservedVariables.lookup(SP); const auto &PV = PreservedVariables.lookup(SP);
SmallVector<Metadata *, 4> Variables(PV.begin(), PV.end()); SmallVector<Metadata *, 4> Variables(PV.begin(), PV.end());
@@ -101,13 +98,11 @@ void DIBuilder::finalize() {
} }
} }
DIArray GVs = getOrCreateArray(AllGVs); TempGVs->replaceAllUsesWith(MDTuple::get(VMContext, AllGVs));
TempGVs->replaceAllUsesWith(GVs.get());
SmallVector<Metadata *, 16> RetainValuesI(AllImportedModules.begin(), TempImportedModules->replaceAllUsesWith(MDTuple::get(
AllImportedModules.end()); VMContext, SmallVector<Metadata *, 16>(AllImportedModules.begin(),
DIArray IMs = getOrCreateArray(RetainValuesI); AllImportedModules.end())));
TempImportedModules->replaceAllUsesWith(IMs.get());
// Now that all temp nodes have been replaced or deleted, resolve remaining // Now that all temp nodes have been replaced or deleted, resolve remaining
// cycles. // cycles.
@@ -121,19 +116,16 @@ void DIBuilder::finalize() {
} }
/// If N is compile unit return NULL otherwise return N. /// If N is compile unit return NULL otherwise return N.
static MDScope *getNonCompileUnitScope(MDNode *N) { static MDScope *getNonCompileUnitScope(MDScope *N) {
if (!N || isa<MDCompileUnit>(N)) if (!N || isa<MDCompileUnit>(N))
return nullptr; return nullptr;
return cast<MDScope>(N); return cast<MDScope>(N);
} }
DICompileUnit DIBuilder::createCompileUnit(unsigned Lang, StringRef Filename, MDCompileUnit *DIBuilder::createCompileUnit(
StringRef Directory, unsigned Lang, StringRef Filename, StringRef Directory, StringRef Producer,
StringRef Producer, bool isOptimized, bool isOptimized, StringRef Flags, unsigned RunTimeVer, StringRef SplitName,
StringRef Flags, unsigned RunTimeVer, DebugEmissionKind Kind, bool EmitDebugInfo) {
StringRef SplitName,
DebugEmissionKind Kind,
bool EmitDebugInfo) {
assert(((Lang <= dwarf::DW_LANG_Fortran08 && Lang >= dwarf::DW_LANG_C89) || assert(((Lang <= dwarf::DW_LANG_Fortran08 && Lang >= dwarf::DW_LANG_C89) ||
(Lang <= dwarf::DW_LANG_hi_user && Lang >= dwarf::DW_LANG_lo_user)) && (Lang <= dwarf::DW_LANG_hi_user && Lang >= dwarf::DW_LANG_lo_user)) &&
@@ -171,113 +163,107 @@ DICompileUnit DIBuilder::createCompileUnit(unsigned Lang, StringRef Filename,
return CUNode; return CUNode;
} }
static DIImportedEntity static MDImportedEntity*
createImportedModule(LLVMContext &C, dwarf::Tag Tag, DIScope Context, createImportedModule(LLVMContext &C, dwarf::Tag Tag, MDScope* Context,
Metadata *NS, unsigned Line, StringRef Name, Metadata *NS, unsigned Line, StringRef Name,
SmallVectorImpl<TrackingMDNodeRef> &AllImportedModules) { SmallVectorImpl<TrackingMDNodeRef> &AllImportedModules) {
DIImportedEntity M = auto *M =
MDImportedEntity::get(C, Tag, Context, DebugNodeRef(NS), Line, Name); MDImportedEntity::get(C, Tag, Context, DebugNodeRef(NS), Line, Name);
AllImportedModules.emplace_back(M); AllImportedModules.emplace_back(M);
return M; return M;
} }
DIImportedEntity DIBuilder::createImportedModule(DIScope Context, MDImportedEntity* DIBuilder::createImportedModule(MDScope* Context,
DINameSpace NS, MDNamespace* NS,
unsigned Line) { unsigned Line) {
return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_module, return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_module,
Context, NS, Line, StringRef(), AllImportedModules); Context, NS, Line, StringRef(), AllImportedModules);
} }
DIImportedEntity DIBuilder::createImportedModule(DIScope Context, MDImportedEntity* DIBuilder::createImportedModule(MDScope* Context,
DIImportedEntity NS, MDImportedEntity* NS,
unsigned Line) { unsigned Line) {
return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_module, return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_module,
Context, NS, Line, StringRef(), AllImportedModules); Context, NS, Line, StringRef(), AllImportedModules);
} }
DIImportedEntity DIBuilder::createImportedDeclaration(DIScope Context, MDImportedEntity *DIBuilder::createImportedDeclaration(MDScope *Context,
DIDescriptor Decl, DebugNode *Decl,
unsigned Line, unsigned Line,
StringRef Name) { StringRef Name) {
// Make sure to use the unique identifier based metadata reference for // Make sure to use the unique identifier based metadata reference for
// types that have one. // types that have one.
return ::createImportedModule(
VMContext, dwarf::DW_TAG_imported_declaration, Context,
DebugNodeRef::get(cast_or_null<DebugNode>(Decl)), Line, Name,
AllImportedModules);
}
DIImportedEntity DIBuilder::createImportedDeclaration(DIScope Context,
DIImportedEntity Imp,
unsigned Line, StringRef Name) {
return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_declaration, return ::createImportedModule(VMContext, dwarf::DW_TAG_imported_declaration,
Context, Imp, Line, Name, AllImportedModules); Context, DebugNodeRef::get(Decl), Line, Name,
AllImportedModules);
} }
DIFile DIBuilder::createFile(StringRef Filename, StringRef Directory) { MDFile* DIBuilder::createFile(StringRef Filename, StringRef Directory) {
return MDFile::get(VMContext, Filename, Directory); return MDFile::get(VMContext, Filename, Directory);
} }
DIEnumerator DIBuilder::createEnumerator(StringRef Name, int64_t Val) { MDEnumerator *DIBuilder::createEnumerator(StringRef Name, int64_t Val) {
assert(!Name.empty() && "Unable to create enumerator without name"); assert(!Name.empty() && "Unable to create enumerator without name");
return MDEnumerator::get(VMContext, Val, Name); return MDEnumerator::get(VMContext, Val, Name);
} }
DIBasicType DIBuilder::createUnspecifiedType(StringRef Name) { MDBasicType *DIBuilder::createUnspecifiedType(StringRef Name) {
assert(!Name.empty() && "Unable to create type without name"); assert(!Name.empty() && "Unable to create type without name");
return MDBasicType::get(VMContext, dwarf::DW_TAG_unspecified_type, Name); return MDBasicType::get(VMContext, dwarf::DW_TAG_unspecified_type, Name);
} }
DIBasicType DIBuilder::createNullPtrType() { MDBasicType *DIBuilder::createNullPtrType() {
return createUnspecifiedType("decltype(nullptr)"); return createUnspecifiedType("decltype(nullptr)");
} }
DIBasicType MDBasicType *DIBuilder::createBasicType(StringRef Name, uint64_t SizeInBits,
DIBuilder::createBasicType(StringRef Name, uint64_t SizeInBits, uint64_t AlignInBits,
uint64_t AlignInBits, unsigned Encoding) { unsigned Encoding) {
assert(!Name.empty() && "Unable to create type without name"); assert(!Name.empty() && "Unable to create type without name");
return MDBasicType::get(VMContext, dwarf::DW_TAG_base_type, Name, SizeInBits, return MDBasicType::get(VMContext, dwarf::DW_TAG_base_type, Name, SizeInBits,
AlignInBits, Encoding); AlignInBits, Encoding);
} }
DIDerivedType DIBuilder::createQualifiedType(unsigned Tag, DIType FromTy) { MDDerivedType *DIBuilder::createQualifiedType(unsigned Tag, MDType *FromTy) {
return MDDerivedType::get(VMContext, Tag, "", nullptr, 0, nullptr, return MDDerivedType::get(VMContext, Tag, "", nullptr, 0, nullptr,
MDTypeRef::get(FromTy), 0, 0, 0, 0); MDTypeRef::get(FromTy), 0, 0, 0, 0);
} }
DIDerivedType MDDerivedType *DIBuilder::createPointerType(MDType *PointeeTy,
DIBuilder::createPointerType(DIType PointeeTy, uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, StringRef Name) { uint64_t AlignInBits,
StringRef Name) {
// FIXME: Why is there a name here? // FIXME: Why is there a name here?
return MDDerivedType::get(VMContext, dwarf::DW_TAG_pointer_type, Name, return MDDerivedType::get(VMContext, dwarf::DW_TAG_pointer_type, Name,
nullptr, 0, nullptr, MDTypeRef::get(PointeeTy), nullptr, 0, nullptr, MDTypeRef::get(PointeeTy),
SizeInBits, AlignInBits, 0, 0); SizeInBits, AlignInBits, 0, 0);
} }
DIDerivedType MDDerivedType *DIBuilder::createMemberPointerType(MDType *PointeeTy,
DIBuilder::createMemberPointerType(DIType PointeeTy, DIType Base, MDType *Base,
uint64_t SizeInBits, uint64_t AlignInBits) { uint64_t SizeInBits,
uint64_t AlignInBits) {
return MDDerivedType::get(VMContext, dwarf::DW_TAG_ptr_to_member_type, "", return MDDerivedType::get(VMContext, dwarf::DW_TAG_ptr_to_member_type, "",
nullptr, 0, nullptr, MDTypeRef::get(PointeeTy), nullptr, 0, nullptr, MDTypeRef::get(PointeeTy),
SizeInBits, AlignInBits, 0, 0, MDTypeRef::get(Base)); SizeInBits, AlignInBits, 0, 0, MDTypeRef::get(Base));
} }
DIDerivedType DIBuilder::createReferenceType(unsigned Tag, DIType RTy) { MDDerivedType *DIBuilder::createReferenceType(unsigned Tag, MDType *RTy) {
assert(RTy && "Unable to create reference type"); assert(RTy && "Unable to create reference type");
return MDDerivedType::get(VMContext, Tag, "", nullptr, 0, nullptr, return MDDerivedType::get(VMContext, Tag, "", nullptr, 0, nullptr,
MDTypeRef::get(RTy), 0, 0, 0, 0); MDTypeRef::get(RTy), 0, 0, 0, 0);
} }
DIDerivedType DIBuilder::createTypedef(DIType Ty, StringRef Name, DIFile File, MDDerivedType *DIBuilder::createTypedef(MDType *Ty, StringRef Name,
unsigned LineNo, DIDescriptor Context) { MDFile *File, unsigned LineNo,
return MDDerivedType::get( MDScope *Context) {
VMContext, dwarf::DW_TAG_typedef, Name, File, LineNo, return MDDerivedType::get(VMContext, dwarf::DW_TAG_typedef, Name, File,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Context))), LineNo,
MDTypeRef::get(Ty), 0, 0, 0, 0); MDScopeRef::get(getNonCompileUnitScope(Context)),
MDTypeRef::get(Ty), 0, 0, 0, 0);
} }
DIDerivedType DIBuilder::createFriend(DIType Ty, DIType FriendTy) { MDDerivedType *DIBuilder::createFriend(MDType *Ty, MDType *FriendTy) {
// typedefs are encoded in DIDerivedType format.
assert(Ty && "Invalid type!"); assert(Ty && "Invalid type!");
assert(FriendTy && "Invalid friend type!"); assert(FriendTy && "Invalid friend type!");
return MDDerivedType::get(VMContext, dwarf::DW_TAG_friend, "", nullptr, 0, return MDDerivedType::get(VMContext, dwarf::DW_TAG_friend, "", nullptr, 0,
@@ -285,25 +271,25 @@ DIDerivedType DIBuilder::createFriend(DIType Ty, DIType FriendTy) {
0, 0); 0, 0);
} }
DIDerivedType DIBuilder::createInheritance(DIType Ty, DIType BaseTy, MDDerivedType *DIBuilder::createInheritance(MDType *Ty, MDType *BaseTy,
uint64_t BaseOffset, uint64_t BaseOffset,
unsigned Flags) { unsigned Flags) {
assert(Ty && "Unable to create inheritance"); assert(Ty && "Unable to create inheritance");
return MDDerivedType::get(VMContext, dwarf::DW_TAG_inheritance, "", nullptr, return MDDerivedType::get(VMContext, dwarf::DW_TAG_inheritance, "", nullptr,
0, MDTypeRef::get(Ty), MDTypeRef::get(BaseTy), 0, 0, 0, MDTypeRef::get(Ty), MDTypeRef::get(BaseTy), 0, 0,
BaseOffset, Flags); BaseOffset, Flags);
} }
DIDerivedType DIBuilder::createMemberType(DIDescriptor Scope, StringRef Name, MDDerivedType *DIBuilder::createMemberType(MDScope *Scope, StringRef Name,
DIFile File, unsigned LineNumber, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, uint64_t AlignInBits,
uint64_t OffsetInBits, unsigned Flags, uint64_t OffsetInBits,
DIType Ty) { unsigned Flags, MDType *Ty) {
return MDDerivedType::get( return MDDerivedType::get(
VMContext, dwarf::DW_TAG_member, Name, File, LineNumber, VMContext, dwarf::DW_TAG_member, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), MDScopeRef::get(getNonCompileUnitScope(Scope)), MDTypeRef::get(Ty),
MDTypeRef::get(Ty), SizeInBits, AlignInBits, OffsetInBits, Flags); SizeInBits, AlignInBits, OffsetInBits, Flags);
} }
static ConstantAsMetadata *getConstantOrNull(Constant *C) { static ConstantAsMetadata *getConstantOrNull(Constant *C) {
@@ -312,95 +298,89 @@ static ConstantAsMetadata *getConstantOrNull(Constant *C) {
return nullptr; return nullptr;
} }
DIDerivedType DIBuilder::createStaticMemberType(DIDescriptor Scope, MDDerivedType *DIBuilder::createStaticMemberType(MDScope *Scope, StringRef Name,
StringRef Name, DIFile File, MDFile *File,
unsigned LineNumber, DIType Ty, unsigned LineNumber,
unsigned Flags, MDType *Ty, unsigned Flags,
llvm::Constant *Val) { llvm::Constant *Val) {
// TAG_member is encoded in DIDerivedType format.
Flags |= DebugNode::FlagStaticMember; Flags |= DebugNode::FlagStaticMember;
return MDDerivedType::get( return MDDerivedType::get(
VMContext, dwarf::DW_TAG_member, Name, File, LineNumber, VMContext, dwarf::DW_TAG_member, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), MDScopeRef::get(getNonCompileUnitScope(Scope)), MDTypeRef::get(Ty), 0, 0,
MDTypeRef::get(Ty), 0, 0, 0, Flags, getConstantOrNull(Val)); 0, Flags, getConstantOrNull(Val));
} }
DIDerivedType DIBuilder::createObjCIVar(StringRef Name, DIFile File, MDDerivedType *DIBuilder::createObjCIVar(StringRef Name, MDFile *File,
unsigned LineNumber, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, uint64_t AlignInBits,
uint64_t OffsetInBits, unsigned Flags, uint64_t OffsetInBits, unsigned Flags,
DIType Ty, MDNode *PropertyNode) { MDType *Ty, MDNode *PropertyNode) {
return MDDerivedType::get( return MDDerivedType::get(
VMContext, dwarf::DW_TAG_member, Name, File, LineNumber, VMContext, dwarf::DW_TAG_member, Name, File, LineNumber,
MDScopeRef::get(getNonCompileUnitScope(File)), MDTypeRef::get(Ty), MDScopeRef::get(getNonCompileUnitScope(File)), MDTypeRef::get(Ty),
SizeInBits, AlignInBits, OffsetInBits, Flags, PropertyNode); SizeInBits, AlignInBits, OffsetInBits, Flags, PropertyNode);
} }
DIObjCProperty MDObjCProperty *
DIBuilder::createObjCProperty(StringRef Name, DIFile File, unsigned LineNumber, DIBuilder::createObjCProperty(StringRef Name, MDFile *File, unsigned LineNumber,
StringRef GetterName, StringRef SetterName, StringRef GetterName, StringRef SetterName,
unsigned PropertyAttributes, DIType Ty) { unsigned PropertyAttributes, MDType *Ty) {
return MDObjCProperty::get(VMContext, Name, File, LineNumber, GetterName, return MDObjCProperty::get(VMContext, Name, File, LineNumber, GetterName,
SetterName, PropertyAttributes, Ty); SetterName, PropertyAttributes, Ty);
} }
DITemplateTypeParameter MDTemplateTypeParameter *
DIBuilder::createTemplateTypeParameter(DIDescriptor Context, StringRef Name, DIBuilder::createTemplateTypeParameter(MDScope *Context, StringRef Name,
DIType Ty) { MDType *Ty) {
assert((!Context || isa<MDCompileUnit>(Context)) && "Expected compile unit"); assert((!Context || isa<MDCompileUnit>(Context)) && "Expected compile unit");
return MDTemplateTypeParameter::get(VMContext, Name, MDTypeRef::get(Ty)); return MDTemplateTypeParameter::get(VMContext, Name, MDTypeRef::get(Ty));
} }
static DITemplateValueParameter static MDTemplateValueParameter *
createTemplateValueParameterHelper(LLVMContext &VMContext, unsigned Tag, createTemplateValueParameterHelper(LLVMContext &VMContext, unsigned Tag,
DIDescriptor Context, StringRef Name, MDScope *Context, StringRef Name, MDType *Ty,
DIType Ty, Metadata *MD) { Metadata *MD) {
assert((!Context || isa<MDCompileUnit>(Context)) && "Expected compile unit"); assert((!Context || isa<MDCompileUnit>(Context)) && "Expected compile unit");
return MDTemplateValueParameter::get(VMContext, Tag, Name, MDTypeRef::get(Ty), return MDTemplateValueParameter::get(VMContext, Tag, Name, MDTypeRef::get(Ty),
MD); MD);
} }
DITemplateValueParameter MDTemplateValueParameter *
DIBuilder::createTemplateValueParameter(DIDescriptor Context, StringRef Name, DIBuilder::createTemplateValueParameter(MDScope *Context, StringRef Name,
DIType Ty, Constant *Val) { MDType *Ty, Constant *Val) {
return createTemplateValueParameterHelper( return createTemplateValueParameterHelper(
VMContext, dwarf::DW_TAG_template_value_parameter, Context, Name, Ty, VMContext, dwarf::DW_TAG_template_value_parameter, Context, Name, Ty,
getConstantOrNull(Val)); getConstantOrNull(Val));
} }
DITemplateValueParameter MDTemplateValueParameter *
DIBuilder::createTemplateTemplateParameter(DIDescriptor Context, StringRef Name, DIBuilder::createTemplateTemplateParameter(MDScope *Context, StringRef Name,
DIType Ty, StringRef Val) { MDType *Ty, StringRef Val) {
return createTemplateValueParameterHelper( return createTemplateValueParameterHelper(
VMContext, dwarf::DW_TAG_GNU_template_template_param, Context, Name, Ty, VMContext, dwarf::DW_TAG_GNU_template_template_param, Context, Name, Ty,
MDString::get(VMContext, Val)); MDString::get(VMContext, Val));
} }
DITemplateValueParameter MDTemplateValueParameter *
DIBuilder::createTemplateParameterPack(DIDescriptor Context, StringRef Name, DIBuilder::createTemplateParameterPack(MDScope *Context, StringRef Name,
DIType Ty, DIArray Val) { MDType *Ty, DIArray Val) {
return createTemplateValueParameterHelper( return createTemplateValueParameterHelper(
VMContext, dwarf::DW_TAG_GNU_template_parameter_pack, Context, Name, Ty, VMContext, dwarf::DW_TAG_GNU_template_parameter_pack, Context, Name, Ty,
Val.get()); Val.get());
} }
DICompositeType DIBuilder::createClassType(DIDescriptor Context, StringRef Name, MDCompositeType *DIBuilder::createClassType(
DIFile File, unsigned LineNumber, MDScope *Context, StringRef Name, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits, uint64_t AlignInBits, uint64_t OffsetInBits,
uint64_t AlignInBits, unsigned Flags, MDType *DerivedFrom, DIArray Elements, MDType *VTableHolder,
uint64_t OffsetInBits, MDNode *TemplateParams, StringRef UniqueIdentifier) {
unsigned Flags, DIType DerivedFrom,
DIArray Elements,
DIType VTableHolder,
MDNode *TemplateParams,
StringRef UniqueIdentifier) {
assert((!Context || isa<MDScope>(Context)) && assert((!Context || isa<MDScope>(Context)) &&
"createClassType should be called with a valid Context"); "createClassType should be called with a valid Context");
// TAG_class_type is encoded in DICompositeType format.
DICompositeType R = MDCompositeType::get( auto *R = MDCompositeType::get(
VMContext, dwarf::DW_TAG_structure_type, Name, File, LineNumber, VMContext, dwarf::DW_TAG_structure_type, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Context))), MDScopeRef::get(getNonCompileUnitScope(Context)),
MDTypeRef::get(DerivedFrom), SizeInBits, AlignInBits, OffsetInBits, Flags, MDTypeRef::get(DerivedFrom), SizeInBits, AlignInBits, OffsetInBits, Flags,
Elements, 0, MDTypeRef::get(VTableHolder), Elements, 0, MDTypeRef::get(VTableHolder),
cast_or_null<MDTuple>(TemplateParams), UniqueIdentifier); cast_or_null<MDTuple>(TemplateParams), UniqueIdentifier);
@@ -410,19 +390,14 @@ DICompositeType DIBuilder::createClassType(DIDescriptor Context, StringRef Name,
return R; return R;
} }
DICompositeType DIBuilder::createStructType(DIDescriptor Context, MDCompositeType *DIBuilder::createStructType(
StringRef Name, DIFile File, MDScope *Context, StringRef Name, MDFile *File, unsigned LineNumber,
unsigned LineNumber, uint64_t SizeInBits, uint64_t AlignInBits, unsigned Flags,
uint64_t SizeInBits, MDType *DerivedFrom, DIArray Elements, unsigned RunTimeLang,
uint64_t AlignInBits, MDType *VTableHolder, StringRef UniqueIdentifier) {
unsigned Flags, DIType DerivedFrom, auto *R = MDCompositeType::get(
DIArray Elements,
unsigned RunTimeLang,
DIType VTableHolder,
StringRef UniqueIdentifier) {
DICompositeType R = MDCompositeType::get(
VMContext, dwarf::DW_TAG_structure_type, Name, File, LineNumber, VMContext, dwarf::DW_TAG_structure_type, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Context))), MDScopeRef::get(getNonCompileUnitScope(Context)),
MDTypeRef::get(DerivedFrom), SizeInBits, AlignInBits, 0, Flags, Elements, MDTypeRef::get(DerivedFrom), SizeInBits, AlignInBits, 0, Flags, Elements,
RunTimeLang, MDTypeRef::get(VTableHolder), nullptr, UniqueIdentifier); RunTimeLang, MDTypeRef::get(VTableHolder), nullptr, UniqueIdentifier);
if (!UniqueIdentifier.empty()) if (!UniqueIdentifier.empty())
@@ -431,37 +406,37 @@ DICompositeType DIBuilder::createStructType(DIDescriptor Context,
return R; return R;
} }
DICompositeType DIBuilder::createUnionType(DIDescriptor Scope, StringRef Name, MDCompositeType* DIBuilder::createUnionType(MDScope * Scope, StringRef Name,
DIFile File, unsigned LineNumber, MDFile* File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, unsigned Flags, uint64_t AlignInBits, unsigned Flags,
DIArray Elements, DIArray Elements,
unsigned RunTimeLang, unsigned RunTimeLang,
StringRef UniqueIdentifier) { StringRef UniqueIdentifier) {
DICompositeType R = MDCompositeType::get( auto *R = MDCompositeType::get(
VMContext, dwarf::DW_TAG_union_type, Name, File, LineNumber, VMContext, dwarf::DW_TAG_union_type, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), nullptr, MDScopeRef::get(getNonCompileUnitScope(Scope)), nullptr, SizeInBits,
SizeInBits, AlignInBits, 0, Flags, Elements, RunTimeLang, nullptr, AlignInBits, 0, Flags, Elements, RunTimeLang, nullptr, nullptr,
nullptr, UniqueIdentifier); UniqueIdentifier);
if (!UniqueIdentifier.empty()) if (!UniqueIdentifier.empty())
retainType(R); retainType(R);
trackIfUnresolved(R); trackIfUnresolved(R);
return R; return R;
} }
DISubroutineType DIBuilder::createSubroutineType(DIFile File, MDSubroutineType *DIBuilder::createSubroutineType(MDFile *File,
DITypeArray ParameterTypes, DITypeArray ParameterTypes,
unsigned Flags) { unsigned Flags) {
return MDSubroutineType::get(VMContext, Flags, ParameterTypes); return MDSubroutineType::get(VMContext, Flags, ParameterTypes);
} }
DICompositeType DIBuilder::createEnumerationType( MDCompositeType *DIBuilder::createEnumerationType(
DIDescriptor Scope, StringRef Name, DIFile File, unsigned LineNumber, MDScope *Scope, StringRef Name, MDFile *File, unsigned LineNumber,
uint64_t SizeInBits, uint64_t AlignInBits, DIArray Elements, uint64_t SizeInBits, uint64_t AlignInBits, DIArray Elements,
DIType UnderlyingType, StringRef UniqueIdentifier) { MDType *UnderlyingType, StringRef UniqueIdentifier) {
DICompositeType CTy = MDCompositeType::get( auto *CTy = MDCompositeType::get(
VMContext, dwarf::DW_TAG_enumeration_type, Name, File, LineNumber, VMContext, dwarf::DW_TAG_enumeration_type, Name, File, LineNumber,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), MDScopeRef::get(getNonCompileUnitScope(Scope)),
MDTypeRef::get(UnderlyingType), SizeInBits, AlignInBits, 0, 0, Elements, MDTypeRef::get(UnderlyingType), SizeInBits, AlignInBits, 0, 0, Elements,
0, nullptr, nullptr, UniqueIdentifier); 0, nullptr, nullptr, UniqueIdentifier);
AllEnumTypes.push_back(CTy); AllEnumTypes.push_back(CTy);
@@ -471,8 +446,8 @@ DICompositeType DIBuilder::createEnumerationType(
return CTy; return CTy;
} }
DICompositeType DIBuilder::createArrayType(uint64_t Size, uint64_t AlignInBits, MDCompositeType *DIBuilder::createArrayType(uint64_t Size, uint64_t AlignInBits,
DIType Ty, DIArray Subscripts) { MDType *Ty, DIArray Subscripts) {
auto *R = MDCompositeType::get(VMContext, dwarf::DW_TAG_array_type, "", auto *R = MDCompositeType::get(VMContext, dwarf::DW_TAG_array_type, "",
nullptr, 0, nullptr, MDTypeRef::get(Ty), Size, nullptr, 0, nullptr, MDTypeRef::get(Ty), Size,
AlignInBits, 0, 0, Subscripts, 0, nullptr); AlignInBits, 0, 0, Subscripts, 0, nullptr);
@@ -480,8 +455,9 @@ DICompositeType DIBuilder::createArrayType(uint64_t Size, uint64_t AlignInBits,
return R; return R;
} }
DICompositeType DIBuilder::createVectorType(uint64_t Size, uint64_t AlignInBits, MDCompositeType *DIBuilder::createVectorType(uint64_t Size,
DIType Ty, DIArray Subscripts) { uint64_t AlignInBits, MDType *Ty,
DIArray Subscripts) {
auto *R = auto *R =
MDCompositeType::get(VMContext, dwarf::DW_TAG_array_type, "", nullptr, 0, MDCompositeType::get(VMContext, dwarf::DW_TAG_array_type, "", nullptr, 0,
nullptr, MDTypeRef::get(Ty), Size, AlignInBits, 0, nullptr, MDTypeRef::get(Ty), Size, AlignInBits, 0,
@@ -490,21 +466,21 @@ DICompositeType DIBuilder::createVectorType(uint64_t Size, uint64_t AlignInBits,
return R; return R;
} }
static DIType createTypeWithFlags(LLVMContext &Context, DIType Ty, static MDType *createTypeWithFlags(LLVMContext &Context, MDType *Ty,
unsigned FlagsToSet) { unsigned FlagsToSet) {
TempMDType NewTy = cast<MDType>(static_cast<MDNode *>(Ty))->clone(); auto NewTy = Ty->clone();
NewTy->setFlags(NewTy->getFlags() | FlagsToSet); NewTy->setFlags(NewTy->getFlags() | FlagsToSet);
return MDNode::replaceWithUniqued(std::move(NewTy)); return MDNode::replaceWithUniqued(std::move(NewTy));
} }
DIType DIBuilder::createArtificialType(DIType Ty) { MDType *DIBuilder::createArtificialType(MDType *Ty) {
// FIXME: Restrict this to the nodes where it's valid. // FIXME: Restrict this to the nodes where it's valid.
if (Ty->isArtificial()) if (Ty->isArtificial())
return Ty; return Ty;
return createTypeWithFlags(VMContext, Ty, DebugNode::FlagArtificial); return createTypeWithFlags(VMContext, Ty, DebugNode::FlagArtificial);
} }
DIType DIBuilder::createObjectPointerType(DIType Ty) { MDType *DIBuilder::createObjectPointerType(MDType *Ty) {
// FIXME: Restrict this to the nodes where it's valid. // FIXME: Restrict this to the nodes where it's valid.
if (Ty->isObjectPointer()) if (Ty->isObjectPointer())
return Ty; return Ty;
@@ -512,42 +488,40 @@ DIType DIBuilder::createObjectPointerType(DIType Ty) {
return createTypeWithFlags(VMContext, Ty, Flags); return createTypeWithFlags(VMContext, Ty, Flags);
} }
void DIBuilder::retainType(DIType T) { void DIBuilder::retainType(MDType *T) {
assert(T && "Expected non-null type"); assert(T && "Expected non-null type");
AllRetainTypes.emplace_back(T); AllRetainTypes.emplace_back(T);
} }
DIBasicType DIBuilder::createUnspecifiedParameter() { return nullptr; } MDBasicType *DIBuilder::createUnspecifiedParameter() { return nullptr; }
DICompositeType MDCompositeType*
DIBuilder::createForwardDecl(unsigned Tag, StringRef Name, DIDescriptor Scope, DIBuilder::createForwardDecl(unsigned Tag, StringRef Name, MDScope * Scope,
DIFile F, unsigned Line, unsigned RuntimeLang, MDFile* F, unsigned Line, unsigned RuntimeLang,
uint64_t SizeInBits, uint64_t AlignInBits, uint64_t SizeInBits, uint64_t AlignInBits,
StringRef UniqueIdentifier) { StringRef UniqueIdentifier) {
// FIXME: Define in terms of createReplaceableForwardDecl() by calling // FIXME: Define in terms of createReplaceableForwardDecl() by calling
// replaceWithUniqued(). // replaceWithUniqued().
DICompositeType RetTy = MDCompositeType::get( auto *RetTy = MDCompositeType::get(
VMContext, Tag, Name, F, Line, VMContext, Tag, Name, F, Line,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), nullptr, MDScopeRef::get(getNonCompileUnitScope(Scope)), nullptr, SizeInBits,
SizeInBits, AlignInBits, 0, DebugNode::FlagFwdDecl, nullptr, RuntimeLang, AlignInBits, 0, DebugNode::FlagFwdDecl, nullptr, RuntimeLang, nullptr,
nullptr, nullptr, UniqueIdentifier); nullptr, UniqueIdentifier);
if (!UniqueIdentifier.empty()) if (!UniqueIdentifier.empty())
retainType(RetTy); retainType(RetTy);
trackIfUnresolved(RetTy); trackIfUnresolved(RetTy);
return RetTy; return RetTy;
} }
DICompositeType DIBuilder::createReplaceableCompositeType( MDCompositeType* DIBuilder::createReplaceableCompositeType(
unsigned Tag, StringRef Name, DIDescriptor Scope, DIFile F, unsigned Line, unsigned Tag, StringRef Name, MDScope * Scope, MDFile* F, unsigned Line,
unsigned RuntimeLang, uint64_t SizeInBits, uint64_t AlignInBits, unsigned RuntimeLang, uint64_t SizeInBits, uint64_t AlignInBits,
unsigned Flags, StringRef UniqueIdentifier) { unsigned Flags, StringRef UniqueIdentifier) {
DICompositeType RetTy = auto *RetTy = MDCompositeType::getTemporary(
MDCompositeType::getTemporary( VMContext, Tag, Name, F, Line,
VMContext, Tag, Name, F, Line, MDScopeRef::get(getNonCompileUnitScope(Scope)), nullptr,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Scope))), nullptr, SizeInBits, AlignInBits, 0, Flags, nullptr, RuntimeLang,
SizeInBits, AlignInBits, 0, Flags, nullptr, RuntimeLang, nullptr, nullptr, nullptr, UniqueIdentifier).release();
nullptr, UniqueIdentifier)
.release();
if (!UniqueIdentifier.empty()) if (!UniqueIdentifier.empty())
retainType(RetTy); retainType(RetTy);
trackIfUnresolved(RetTy); trackIfUnresolved(RetTy);
@@ -555,7 +529,7 @@ DICompositeType DIBuilder::createReplaceableCompositeType(
} }
DIArray DIBuilder::getOrCreateArray(ArrayRef<Metadata *> Elements) { DIArray DIBuilder::getOrCreateArray(ArrayRef<Metadata *> Elements) {
return DIArray(MDNode::get(VMContext, Elements)); return MDTuple::get(VMContext, Elements);
} }
DITypeArray DIBuilder::getOrCreateTypeArray(ArrayRef<Metadata *> Elements) { DITypeArray DIBuilder::getOrCreateTypeArray(ArrayRef<Metadata *> Elements) {
@@ -569,11 +543,11 @@ DITypeArray DIBuilder::getOrCreateTypeArray(ArrayRef<Metadata *> Elements) {
return DITypeArray(MDNode::get(VMContext, Elts)); return DITypeArray(MDNode::get(VMContext, Elts));
} }
DISubrange DIBuilder::getOrCreateSubrange(int64_t Lo, int64_t Count) { MDSubrange *DIBuilder::getOrCreateSubrange(int64_t Lo, int64_t Count) {
return MDSubrange::get(VMContext, Count, Lo); return MDSubrange::get(VMContext, Count, Lo);
} }
static void checkGlobalVariableScope(DIDescriptor Context) { static void checkGlobalVariableScope(MDScope * Context) {
#ifndef NDEBUG #ifndef NDEBUG
if (auto *CT = if (auto *CT =
dyn_cast_or_null<MDCompositeType>(getNonCompileUnitScope(Context))) dyn_cast_or_null<MDCompositeType>(getNonCompileUnitScope(Context)))
@@ -582,9 +556,9 @@ static void checkGlobalVariableScope(DIDescriptor Context) {
#endif #endif
} }
DIGlobalVariable DIBuilder::createGlobalVariable( MDGlobalVariable *DIBuilder::createGlobalVariable(
DIDescriptor Context, StringRef Name, StringRef LinkageName, DIFile F, MDScope *Context, StringRef Name, StringRef LinkageName, MDFile *F,
unsigned LineNumber, DIType Ty, bool isLocalToUnit, Constant *Val, unsigned LineNumber, MDType *Ty, bool isLocalToUnit, Constant *Val,
MDNode *Decl) { MDNode *Decl) {
checkGlobalVariableScope(Context); checkGlobalVariableScope(Context);
@@ -596,9 +570,9 @@ DIGlobalVariable DIBuilder::createGlobalVariable(
return N; return N;
} }
DIGlobalVariable DIBuilder::createTempGlobalVariableFwdDecl( MDGlobalVariable *DIBuilder::createTempGlobalVariableFwdDecl(
DIDescriptor Context, StringRef Name, StringRef LinkageName, DIFile F, MDScope *Context, StringRef Name, StringRef LinkageName, MDFile *F,
unsigned LineNumber, DIType Ty, bool isLocalToUnit, Constant *Val, unsigned LineNumber, MDType *Ty, bool isLocalToUnit, Constant *Val,
MDNode *Decl) { MDNode *Decl) {
checkGlobalVariableScope(Context); checkGlobalVariableScope(Context);
@@ -609,16 +583,14 @@ DIGlobalVariable DIBuilder::createTempGlobalVariableFwdDecl(
.release(); .release();
} }
DIVariable DIBuilder::createLocalVariable(unsigned Tag, DIDescriptor Scope, MDLocalVariable *DIBuilder::createLocalVariable(
StringRef Name, DIFile File, unsigned Tag, MDScope *Scope, StringRef Name, MDFile *File, unsigned LineNo,
unsigned LineNo, DIType Ty, MDType *Ty, bool AlwaysPreserve, unsigned Flags, unsigned ArgNo) {
bool AlwaysPreserve, unsigned Flags,
unsigned ArgNo) {
// FIXME: Why getNonCompileUnitScope()? // FIXME: Why getNonCompileUnitScope()?
// FIXME: Why is "!Context" okay here? // FIXME: Why is "!Context" okay here?
// FIXME: WHy doesn't this check for a subprogram or lexical block (AFAICT // FIXME: WHy doesn't this check for a subprogram or lexical block (AFAICT
// the only valid scopes)? // the only valid scopes)?
DIScope Context = getNonCompileUnitScope(Scope); MDScope* Context = getNonCompileUnitScope(Scope);
auto *Node = MDLocalVariable::get( auto *Node = MDLocalVariable::get(
VMContext, Tag, cast_or_null<MDLocalScope>(Context), Name, File, LineNo, VMContext, Tag, cast_or_null<MDLocalScope>(Context), Name, File, LineNo,
@@ -627,32 +599,32 @@ DIVariable DIBuilder::createLocalVariable(unsigned Tag, DIDescriptor Scope,
// The optimizer may remove local variable. If there is an interest // The optimizer may remove local variable. If there is an interest
// to preserve variable info in such situation then stash it in a // to preserve variable info in such situation then stash it in a
// named mdnode. // named mdnode.
DISubprogram Fn(getDISubprogram(Scope)); MDSubprogram *Fn = getDISubprogram(Scope);
assert(Fn && "Missing subprogram for local variable"); assert(Fn && "Missing subprogram for local variable");
PreservedVariables[Fn].emplace_back(Node); PreservedVariables[Fn].emplace_back(Node);
} }
return Node; return Node;
} }
DIExpression DIBuilder::createExpression(ArrayRef<uint64_t> Addr) { MDExpression* DIBuilder::createExpression(ArrayRef<uint64_t> Addr) {
return MDExpression::get(VMContext, Addr); return MDExpression::get(VMContext, Addr);
} }
DIExpression DIBuilder::createExpression(ArrayRef<int64_t> Signed) { MDExpression* DIBuilder::createExpression(ArrayRef<int64_t> Signed) {
// TODO: Remove the callers of this signed version and delete. // TODO: Remove the callers of this signed version and delete.
SmallVector<uint64_t, 8> Addr(Signed.begin(), Signed.end()); SmallVector<uint64_t, 8> Addr(Signed.begin(), Signed.end());
return createExpression(Addr); return createExpression(Addr);
} }
DIExpression DIBuilder::createBitPieceExpression(unsigned OffsetInBytes, MDExpression* DIBuilder::createBitPieceExpression(unsigned OffsetInBytes,
unsigned SizeInBytes) { unsigned SizeInBytes) {
uint64_t Addr[] = {dwarf::DW_OP_bit_piece, OffsetInBytes, SizeInBytes}; uint64_t Addr[] = {dwarf::DW_OP_bit_piece, OffsetInBytes, SizeInBytes};
return MDExpression::get(VMContext, Addr); return MDExpression::get(VMContext, Addr);
} }
DISubprogram DIBuilder::createFunction(DIScopeRef Context, StringRef Name, MDSubprogram* DIBuilder::createFunction(DIScopeRef Context, StringRef Name,
StringRef LinkageName, DIFile File, StringRef LinkageName, MDFile* File,
unsigned LineNo, DICompositeType Ty, unsigned LineNo, MDSubroutineType* Ty,
bool isLocalToUnit, bool isDefinition, bool isLocalToUnit, bool isDefinition,
unsigned ScopeLine, unsigned Flags, unsigned ScopeLine, unsigned Flags,
bool isOptimized, Function *Fn, bool isOptimized, Function *Fn,
@@ -665,9 +637,9 @@ DISubprogram DIBuilder::createFunction(DIScopeRef Context, StringRef Name,
Flags, isOptimized, Fn, TParams, Decl); Flags, isOptimized, Fn, TParams, Decl);
} }
DISubprogram DIBuilder::createFunction(DIDescriptor Context, StringRef Name, MDSubprogram* DIBuilder::createFunction(MDScope * Context, StringRef Name,
StringRef LinkageName, DIFile File, StringRef LinkageName, MDFile* File,
unsigned LineNo, DICompositeType Ty, unsigned LineNo, MDSubroutineType* Ty,
bool isLocalToUnit, bool isDefinition, bool isLocalToUnit, bool isDefinition,
unsigned ScopeLine, unsigned Flags, unsigned ScopeLine, unsigned Flags,
bool isOptimized, Function *Fn, bool isOptimized, Function *Fn,
@@ -675,8 +647,8 @@ DISubprogram DIBuilder::createFunction(DIDescriptor Context, StringRef Name,
assert(Ty->getTag() == dwarf::DW_TAG_subroutine_type && assert(Ty->getTag() == dwarf::DW_TAG_subroutine_type &&
"function types should be subroutines"); "function types should be subroutines");
auto *Node = MDSubprogram::get( auto *Node = MDSubprogram::get(
VMContext, MDScopeRef::get(DIScope(getNonCompileUnitScope(Context))), VMContext, MDScopeRef::get(getNonCompileUnitScope(Context)), Name,
Name, LinkageName, File, LineNo, cast_or_null<MDSubroutineType>(Ty), LinkageName, File, LineNo, Ty,
isLocalToUnit, isDefinition, ScopeLine, nullptr, 0, 0, Flags, isOptimized, isLocalToUnit, isDefinition, ScopeLine, nullptr, 0, 0, Flags, isOptimized,
Fn, cast_or_null<MDTuple>(TParams), cast_or_null<MDSubprogram>(Decl), Fn, cast_or_null<MDTuple>(TParams), cast_or_null<MDSubprogram>(Decl),
MDTuple::getTemporary(VMContext, None).release()); MDTuple::getTemporary(VMContext, None).release());
@@ -687,32 +659,28 @@ DISubprogram DIBuilder::createFunction(DIDescriptor Context, StringRef Name,
return Node; return Node;
} }
DISubprogram MDSubprogram*
DIBuilder::createTempFunctionFwdDecl(DIDescriptor Context, StringRef Name, DIBuilder::createTempFunctionFwdDecl(MDScope * Context, StringRef Name,
StringRef LinkageName, DIFile File, StringRef LinkageName, MDFile* File,
unsigned LineNo, DICompositeType Ty, unsigned LineNo, MDSubroutineType* Ty,
bool isLocalToUnit, bool isDefinition, bool isLocalToUnit, bool isDefinition,
unsigned ScopeLine, unsigned Flags, unsigned ScopeLine, unsigned Flags,
bool isOptimized, Function *Fn, bool isOptimized, Function *Fn,
MDNode *TParams, MDNode *Decl) { MDNode *TParams, MDNode *Decl) {
return MDSubprogram::getTemporary( return MDSubprogram::getTemporary(
VMContext, VMContext, MDScopeRef::get(getNonCompileUnitScope(Context)), Name,
MDScopeRef::get(DIScope(getNonCompileUnitScope(Context))), Name, LinkageName, File, LineNo, Ty,
LinkageName, File, LineNo, cast_or_null<MDSubroutineType>(Ty),
isLocalToUnit, isDefinition, ScopeLine, nullptr, 0, 0, Flags, isLocalToUnit, isDefinition, ScopeLine, nullptr, 0, 0, Flags,
isOptimized, Fn, cast_or_null<MDTuple>(TParams), isOptimized, Fn, cast_or_null<MDTuple>(TParams),
cast_or_null<MDSubprogram>(Decl), nullptr) cast_or_null<MDSubprogram>(Decl), nullptr).release();
.release();
} }
DISubprogram DIBuilder::createMethod(DIDescriptor Context, StringRef Name, MDSubprogram *
StringRef LinkageName, DIFile F, DIBuilder::createMethod(MDScope *Context, StringRef Name, StringRef LinkageName,
unsigned LineNo, DICompositeType Ty, MDFile *F, unsigned LineNo, MDSubroutineType *Ty,
bool isLocalToUnit, bool isDefinition, bool isLocalToUnit, bool isDefinition, unsigned VK,
unsigned VK, unsigned VIndex, unsigned VIndex, MDType *VTableHolder, unsigned Flags,
DIType VTableHolder, unsigned Flags, bool isOptimized, Function *Fn, MDNode *TParam) {
bool isOptimized, Function *Fn,
MDNode *TParam) {
assert(Ty->getTag() == dwarf::DW_TAG_subroutine_type && assert(Ty->getTag() == dwarf::DW_TAG_subroutine_type &&
"function types should be subroutines"); "function types should be subroutines");
assert(getNonCompileUnitScope(Context) && assert(getNonCompileUnitScope(Context) &&
@@ -721,8 +689,8 @@ DISubprogram DIBuilder::createMethod(DIDescriptor Context, StringRef Name,
// FIXME: Do we want to use different scope/lines? // FIXME: Do we want to use different scope/lines?
auto *SP = MDSubprogram::get( auto *SP = MDSubprogram::get(
VMContext, MDScopeRef::get(cast<MDScope>(Context)), Name, LinkageName, F, VMContext, MDScopeRef::get(cast<MDScope>(Context)), Name, LinkageName, F,
LineNo, cast_or_null<MDSubroutineType>(Ty), isLocalToUnit, isDefinition, LineNo, Ty, isLocalToUnit, isDefinition, LineNo,
LineNo, MDTypeRef::get(VTableHolder), VK, VIndex, Flags, isOptimized, Fn, MDTypeRef::get(VTableHolder), VK, VIndex, Flags, isOptimized, Fn,
cast_or_null<MDTuple>(TParam), nullptr, nullptr); cast_or_null<MDTuple>(TParam), nullptr, nullptr);
if (isDefinition) if (isDefinition)
@@ -731,19 +699,19 @@ DISubprogram DIBuilder::createMethod(DIDescriptor Context, StringRef Name,
return SP; return SP;
} }
DINameSpace DIBuilder::createNameSpace(DIDescriptor Scope, StringRef Name, MDNamespace* DIBuilder::createNameSpace(MDScope * Scope, StringRef Name,
DIFile File, unsigned LineNo) { MDFile* File, unsigned LineNo) {
return MDNamespace::get(VMContext, getNonCompileUnitScope(Scope), File, Name, return MDNamespace::get(VMContext, getNonCompileUnitScope(Scope), File, Name,
LineNo); LineNo);
} }
DILexicalBlockFile DIBuilder::createLexicalBlockFile(DIDescriptor Scope, MDLexicalBlockFile* DIBuilder::createLexicalBlockFile(MDScope * Scope,
DIFile File, MDFile* File,
unsigned Discriminator) { unsigned Discriminator) {
return MDLexicalBlockFile::get(VMContext, Scope, File, Discriminator); return MDLexicalBlockFile::get(VMContext, Scope, File, Discriminator);
} }
DILexicalBlock DIBuilder::createLexicalBlock(DIDescriptor Scope, DIFile File, MDLexicalBlock* DIBuilder::createLexicalBlock(MDScope * Scope, MDFile* File,
unsigned Line, unsigned Col) { unsigned Line, unsigned Col) {
// Make these distinct, to avoid merging two lexical blocks on the same // Make these distinct, to avoid merging two lexical blocks on the same
// file/line/column. // file/line/column.
@@ -761,10 +729,10 @@ static Instruction *withDebugLoc(Instruction *I, const MDLocation *DL) {
return I; return I;
} }
Instruction *DIBuilder::insertDeclare(Value *Storage, DIVariable VarInfo, Instruction *DIBuilder::insertDeclare(Value *Storage, MDLocalVariable* VarInfo,
DIExpression Expr, const MDLocation *DL, MDExpression* Expr, const MDLocation *DL,
Instruction *InsertBefore) { Instruction *InsertBefore) {
assert(VarInfo && "empty or invalid DIVariable passed to dbg.declare"); assert(VarInfo && "empty or invalid MDLocalVariable* passed to dbg.declare");
assert(DL && "Expected debug loc"); assert(DL && "Expected debug loc");
assert(DL->getScope()->getSubprogram() == assert(DL->getScope()->getSubprogram() ==
VarInfo->getScope()->getSubprogram() && VarInfo->getScope()->getSubprogram() &&
@@ -780,10 +748,10 @@ Instruction *DIBuilder::insertDeclare(Value *Storage, DIVariable VarInfo,
return withDebugLoc(CallInst::Create(DeclareFn, Args, "", InsertBefore), DL); return withDebugLoc(CallInst::Create(DeclareFn, Args, "", InsertBefore), DL);
} }
Instruction *DIBuilder::insertDeclare(Value *Storage, DIVariable VarInfo, Instruction *DIBuilder::insertDeclare(Value *Storage, MDLocalVariable* VarInfo,
DIExpression Expr, const MDLocation *DL, MDExpression* Expr, const MDLocation *DL,
BasicBlock *InsertAtEnd) { BasicBlock *InsertAtEnd) {
assert(VarInfo && "empty or invalid DIVariable passed to dbg.declare"); assert(VarInfo && "empty or invalid MDLocalVariable* passed to dbg.declare");
assert(DL && "Expected debug loc"); assert(DL && "Expected debug loc");
assert(DL->getScope()->getSubprogram() == assert(DL->getScope()->getSubprogram() ==
VarInfo->getScope()->getSubprogram() && VarInfo->getScope()->getSubprogram() &&
@@ -805,12 +773,12 @@ Instruction *DIBuilder::insertDeclare(Value *Storage, DIVariable VarInfo,
} }
Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset, Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset,
DIVariable VarInfo, MDLocalVariable* VarInfo,
DIExpression Expr, MDExpression* Expr,
const MDLocation *DL, const MDLocation *DL,
Instruction *InsertBefore) { Instruction *InsertBefore) {
assert(V && "no value passed to dbg.value"); assert(V && "no value passed to dbg.value");
assert(VarInfo && "empty or invalid DIVariable passed to dbg.value"); assert(VarInfo && "empty or invalid MDLocalVariable* passed to dbg.value");
assert(DL && "Expected debug loc"); assert(DL && "Expected debug loc");
assert(DL->getScope()->getSubprogram() == assert(DL->getScope()->getSubprogram() ==
VarInfo->getScope()->getSubprogram() && VarInfo->getScope()->getSubprogram() &&
@@ -828,12 +796,12 @@ Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset,
} }
Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset, Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset,
DIVariable VarInfo, MDLocalVariable* VarInfo,
DIExpression Expr, MDExpression* Expr,
const MDLocation *DL, const MDLocation *DL,
BasicBlock *InsertAtEnd) { BasicBlock *InsertAtEnd) {
assert(V && "no value passed to dbg.value"); assert(V && "no value passed to dbg.value");
assert(VarInfo && "empty or invalid DIVariable passed to dbg.value"); assert(VarInfo && "empty or invalid MDLocalVariable* passed to dbg.value");
assert(DL && "Expected debug loc"); assert(DL && "Expected debug loc");
assert(DL->getScope()->getSubprogram() == assert(DL->getScope()->getSubprogram() ==
VarInfo->getScope()->getSubprogram() && VarInfo->getScope()->getSubprogram() &&
@@ -851,9 +819,9 @@ Instruction *DIBuilder::insertDbgValueIntrinsic(Value *V, uint64_t Offset,
return withDebugLoc(CallInst::Create(ValueFn, Args, "", InsertAtEnd), DL); return withDebugLoc(CallInst::Create(ValueFn, Args, "", InsertAtEnd), DL);
} }
void DIBuilder::replaceVTableHolder(DICompositeType &T, DICompositeType VTableHolder) { void DIBuilder::replaceVTableHolder(MDCompositeType* &T, MDCompositeType* VTableHolder) {
{ {
TypedTrackingMDRef<MDCompositeTypeBase> N(T); TypedTrackingMDRef<MDCompositeType> N(T);
N->replaceVTableHolder(MDTypeRef::get(VTableHolder)); N->replaceVTableHolder(MDTypeRef::get(VTableHolder));
T = N.get(); T = N.get();
} }
@@ -870,10 +838,10 @@ void DIBuilder::replaceVTableHolder(DICompositeType &T, DICompositeType VTableHo
trackIfUnresolved(N); trackIfUnresolved(N);
} }
void DIBuilder::replaceArrays(DICompositeType &T, DIArray Elements, void DIBuilder::replaceArrays(MDCompositeType* &T, DIArray Elements,
DIArray TParams) { DIArray TParams) {
{ {
TypedTrackingMDRef<MDCompositeTypeBase> N(T); TypedTrackingMDRef<MDCompositeType> N(T);
if (Elements) if (Elements)
N->replaceElements(Elements); N->replaceElements(Elements);
if (TParams) if (TParams)

3
unittests/Transforms/Utils/Cloning.cpp
View File

@@ -230,7 +230,8 @@ protected:
// Function DI // Function DI
DIFile File = DBuilder.createFile("filename.c", "/file/dir/"); DIFile File = DBuilder.createFile("filename.c", "/file/dir/");
DITypeArray ParamTypes = DBuilder.getOrCreateTypeArray(None); DITypeArray ParamTypes = DBuilder.getOrCreateTypeArray(None);
DICompositeType FuncType = DBuilder.createSubroutineType(File, ParamTypes); MDSubroutineType *FuncType =
DBuilder.createSubroutineType(File, ParamTypes);
DICompileUnit CU = DBuilder.createCompileUnit(dwarf::DW_LANG_C99, DICompileUnit CU = DBuilder.createCompileUnit(dwarf::DW_LANG_C99,
"filename.c", "/file/dir", "CloneFunc", false, "", 0); "filename.c", "/file/dir", "CloneFunc", false, "", 0);