From 59abfa10b712132cd0c40403dc540b21e8334b22 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Mon, 20 Apr 2015 18:20:03 +0000 Subject: [PATCH] DebugInfo: Remove typedefs for DITypeRef, etc. Remove typedefs for type refs: - DITypeRef => MDTypeRef - DIScopeRef => MDScopeRef - DIDescriptorRef => DebugNodeRef git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235323 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/DIBuilder.h | 2 +- include/llvm/IR/DebugInfo.h | 3 --- include/llvm/IR/DebugInfoMetadata.h | 2 +- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 4 ++-- lib/CodeGen/AsmPrinter/DwarfUnit.cpp | 4 ++-- lib/IR/DIBuilder.cpp | 14 +++++++------- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/llvm/IR/DIBuilder.h b/include/llvm/IR/DIBuilder.h index db876549ca8..983f2fc70c0 100644 --- a/include/llvm/IR/DIBuilder.h +++ b/include/llvm/IR/DIBuilder.h @@ -522,7 +522,7 @@ namespace llvm { /// FIXME: this is added for dragonegg. Once we update dragonegg /// to call resolve function, this will be removed. MDSubprogram * - createFunction(DIScopeRef Scope, StringRef Name, StringRef LinkageName, + createFunction(MDScopeRef Scope, StringRef Name, StringRef LinkageName, MDFile *File, unsigned LineNo, MDSubroutineType *Ty, bool isLocalToUnit, bool isDefinition, unsigned ScopeLine, unsigned Flags = 0, bool isOptimized = false, diff --git a/include/llvm/IR/DebugInfo.h b/include/llvm/IR/DebugInfo.h index eede59d725d..2762086b6e9 100644 --- a/include/llvm/IR/DebugInfo.h +++ b/include/llvm/IR/DebugInfo.h @@ -88,9 +88,6 @@ DECLARE_SIMPLIFY_DESCRIPTOR(DIImportedEntity) typedef DebugNodeArray DIArray; typedef MDTypeRefArray DITypeArray; -typedef DebugNodeRef DIDescriptorRef; -typedef MDScopeRef DIScopeRef; -typedef MDTypeRef DITypeRef; class DISubrange { MDSubrange *N; diff --git a/include/llvm/IR/DebugInfoMetadata.h b/include/llvm/IR/DebugInfoMetadata.h index 62373c4b09f..6fef1895ec3 100644 --- a/include/llvm/IR/DebugInfoMetadata.h +++ b/include/llvm/IR/DebugInfoMetadata.h @@ -2141,7 +2141,7 @@ public: /// \brief Get the type. /// /// \note Objective-C doesn't have an ODR, so there is no benefit in storing - /// the type as a DITypeRef here. + /// a type ref here. MDType *getType() const { return cast_or_null(getRawType()); } StringRef getFilename() const { diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 0336b946e85..c69edddc049 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -174,13 +174,13 @@ DIType DbgVariable::getType() const { uint16_t tag = Ty->getTag(); if (tag == dwarf::DW_TAG_pointer_type) - subType = resolve(DITypeRef(cast(Ty)->getBaseType())); + subType = resolve(cast(Ty)->getBaseType()); auto Elements = cast(subType)->getElements(); for (unsigned i = 0, N = Elements.size(); i < N; ++i) { auto *DT = cast(Elements[i]); if (getName() == DT->getName()) - return resolve(DITypeRef(DT->getBaseType())); + return resolve(DT->getBaseType()); } } return Ty; diff --git a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp index b73ca99961e..1dd6b49e48b 100644 --- a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -617,7 +617,7 @@ static bool isUnsignedDIType(DwarfDebug *DD, DIType Ty) { T == dwarf::DW_TAG_volatile_type || T == dwarf::DW_TAG_restrict_type || T == dwarf::DW_TAG_enumeration_type); - if (DITypeRef Deriv = DTy->getBaseType()) + if (MDTypeRef Deriv = DTy->getBaseType()) return isUnsignedDIType(DD, DD->resolve(Deriv)); // FIXME: Enums without a fixed underlying type have unknown signedness // here, leading to incorrectly emitted constants. @@ -813,7 +813,7 @@ DIE *DwarfUnit::getOrCreateTypeDIE(const MDNode *TyNode) { // DW_TAG_restrict_type is not supported in DWARF2 if (Ty->getTag() == dwarf::DW_TAG_restrict_type && DD->getDwarfVersion() <= 2) return getOrCreateTypeDIE( - resolve(DITypeRef(cast(Ty)->getBaseType()))); + resolve(cast(Ty)->getBaseType())); // Construct the context before querying for the existence of the DIE in case // such construction creates the DIE. diff --git a/lib/IR/DIBuilder.cpp b/lib/IR/DIBuilder.cpp index 891fb861ac9..9e0474ebce0 100644 --- a/lib/IR/DIBuilder.cpp +++ b/lib/IR/DIBuilder.cpp @@ -622,13 +622,13 @@ MDExpression* DIBuilder::createBitPieceExpression(unsigned OffsetInBytes, return MDExpression::get(VMContext, Addr); } -MDSubprogram* DIBuilder::createFunction(DIScopeRef Context, StringRef Name, - StringRef LinkageName, MDFile* File, - unsigned LineNo, MDSubroutineType* Ty, - bool isLocalToUnit, bool isDefinition, - unsigned ScopeLine, unsigned Flags, - bool isOptimized, Function *Fn, - MDNode *TParams, MDNode *Decl) { +MDSubprogram *DIBuilder::createFunction(MDScopeRef Context, StringRef Name, + StringRef LinkageName, MDFile *File, + unsigned LineNo, MDSubroutineType *Ty, + bool isLocalToUnit, bool isDefinition, + unsigned ScopeLine, unsigned Flags, + bool isOptimized, Function *Fn, + MDNode *TParams, MDNode *Decl) { // dragonegg does not generate identifier for types, so using an empty map // to resolve the context should be fine. DITypeIdentifierMap EmptyMap; -- 2.34.1