From d2e47e291ce056309eb1d387ffee8bc436e3dd15 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 27 Aug 2015 22:56:46 +0000 Subject: [PATCH] CGDebugInfo: Instead of uniquing RetainedTypes, just refrain from retaining them more than once. (NFC) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@246231 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGDebugInfo.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 109829aa49..d9101f833c 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -1407,6 +1407,12 @@ llvm::DIType *CGDebugInfo::getOrCreateStandaloneType(QualType D, assert(!D.isNull() && "null type"); llvm::DIType *T = getOrCreateType(D, getOrCreateFile(Loc)); assert(T && "could not create debug info for type"); + + // Composite types with UIDs were already retained by DIBuilder + // because they are only referenced by name in the IR. + if (auto *CTy = dyn_cast(T)) + if (!CTy->getIdentifier().empty()) + return T; RetainedTypes.push_back(D.getAsOpaquePtr()); return T; } @@ -3367,14 +3373,9 @@ void CGDebugInfo::finalize() { // We keep our own list of retained types, because we need to look // up the final type in the type cache. - llvm::DenseSet UniqueTypes; - UniqueTypes.resize(RetainedTypes.size() * 2); - for (auto &RT : RetainedTypes) { - if (!UniqueTypes.insert(RT).second) - continue; + for (auto &RT : RetainedTypes) if (auto MD = TypeCache[RT]) DBuilder.retainType(cast(MD)); - } DBuilder.finalize(); } -- 2.40.0