diff options
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/IR/DIBuilder.cpp | 14 | ||||
-rw-r--r-- | llvm/lib/IR/DebugInfo.cpp | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp index 2ff10b593ed..d58a9dcd7a9 100644 --- a/llvm/lib/IR/DIBuilder.cpp +++ b/llvm/lib/IR/DIBuilder.cpp @@ -75,18 +75,6 @@ void DIBuilder::finalize() { DIType(TempImportedModules).replaceAllUsesWith(IMs); } -/// Use the type identifier instead of the actual MDNode if possible, -/// to help type uniquing. This function returns the identifier if it -/// exists for the given type, otherwise returns the MDNode. -static Value *getTypeIdentifier(DIType T) { - if (!T.isCompositeType()) - return T; - DICompositeType DTy(T); - if (!DTy.getIdentifier()) - return T; - return DTy.getIdentifier(); -} - /// getNonCompileUnitScope - If N is compile unit return NULL otherwise return /// N. static MDNode *getNonCompileUnitScope(MDNode *N) { @@ -334,7 +322,7 @@ DIDerivedType DIBuilder::createMemberPointerType(DIType PointeeTy, ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags PointeeTy, - getTypeIdentifier(Base) + Base.generateRef() }; return DIDerivedType(MDNode::get(VMContext, Elts)); } diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp index d3207cae350..70b4257caeb 100644 --- a/llvm/lib/IR/DebugInfo.cpp +++ b/llvm/lib/IR/DebugInfo.cpp @@ -707,6 +707,17 @@ void DICompositeType::addMember(DIDescriptor D) { setTypeArray(DIArray(MDNode::get(DbgNode->getContext(), M))); } +/// Generate a reference to this DIType. Uses the type identifier instead +/// of the actual MDNode if possible, to help type uniquing. +DITypeRef DIType::generateRef() { + if (!isCompositeType()) + return DITypeRef(*this); + DICompositeType DTy(DbgNode); + if (!DTy.getIdentifier()) + return DITypeRef(*this); + return DITypeRef(DTy.getIdentifier()); +} + /// \brief Set the containing type. void DICompositeType::setContainingType(DICompositeType ContainingType) { TrackingVH<MDNode> N(*this); |