diff options
author | Chris Lattner <sabre@nondot.org> | 2011-07-13 04:22:39 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2011-07-13 04:22:39 +0000 |
commit | c09ef37171b2a6c914ce34928a4ff4a839b21dbe (patch) | |
tree | cf3a291fa985da8d813e8e8806279397f933c43f | |
parent | 3b737081e49ef7d640d50285b6cb5f686c75f63d (diff) | |
download | llvm-c09ef37171b2a6c914ce34928a4ff4a839b21dbe.tar.gz llvm-c09ef37171b2a6c914ce34928a4ff4a839b21dbe.tar.bz2 llvm-c09ef37171b2a6c914ce34928a4ff4a839b21dbe.tar.xz |
stop leaking all named struct types with an empty name. Thanks
to Benjamin Kramer for steering me in the right direction here.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135031 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/VMCore/LLVMContextImpl.cpp | 13 | ||||
-rw-r--r-- | lib/VMCore/LLVMContextImpl.h | 1 | ||||
-rw-r--r-- | lib/VMCore/Type.cpp | 12 |
3 files changed, 18 insertions, 8 deletions
diff --git a/lib/VMCore/LLVMContextImpl.cpp b/lib/VMCore/LLVMContextImpl.cpp index 12cb2464b5..2b6bb39167 100644 --- a/lib/VMCore/LLVMContextImpl.cpp +++ b/lib/VMCore/LLVMContextImpl.cpp @@ -81,14 +81,12 @@ LLVMContextImpl::~LLVMContextImpl() { SmallVector<MDNode*, 8> MDNodes; MDNodes.reserve(MDNodeSet.size() + NonUniquedMDNodes.size()); for (FoldingSetIterator<MDNode> I = MDNodeSet.begin(), E = MDNodeSet.end(); - I != E; ++I) { + I != E; ++I) MDNodes.push_back(&*I); - } MDNodes.append(NonUniquedMDNodes.begin(), NonUniquedMDNodes.end()); for (SmallVectorImpl<MDNode *>::iterator I = MDNodes.begin(), - E = MDNodes.end(); I != E; ++I) { + E = MDNodes.end(); I != E; ++I) (*I)->destroy(); - } assert(MDNodeSet.empty() && NonUniquedMDNodes.empty() && "Destroying all MDNodes didn't empty the Context's sets."); // Destroy MDStrings. @@ -103,7 +101,10 @@ LLVMContextImpl::~LLVMContextImpl() { DeleteContainerSeconds(PointerTypes); DeleteContainerSeconds(ASPointerTypes); - for (StringMap<StructType *>::iterator I = NamedStructTypes.begin(), E = NamedStructTypes.end(); I != E; ++I) { + for (StringMap<StructType *>::iterator I = NamedStructTypes.begin(), + E = NamedStructTypes.end(); I != E; ++I) delete I->getValue(); - } + for (SmallPtrSet<StructType*, 16>::iterator I = EmptyNamedStructTypes.begin(), + E = EmptyNamedStructTypes.end(); I != E; ++I) + delete *I; } diff --git a/lib/VMCore/LLVMContextImpl.h b/lib/VMCore/LLVMContextImpl.h index e36864b27b..b26068d85f 100644 --- a/lib/VMCore/LLVMContextImpl.h +++ b/lib/VMCore/LLVMContextImpl.h @@ -179,6 +179,7 @@ public: std::map<std::vector<Type*>, FunctionType*> FunctionTypes; std::map<std::vector<Type*>, StructType*> AnonStructTypes; StringMap<StructType*> NamedStructTypes; + SmallPtrSet<StructType*, 16> EmptyNamedStructTypes; unsigned NamedStructTypesUniqueID; DenseMap<std::pair<Type *, uint64_t>, ArrayType*> ArrayTypes; diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index 10467a8d90..dc5053acc2 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -412,7 +412,10 @@ void StructType::setBody(ArrayRef<Type*> Elements, bool isPacked) { StructType *StructType::createNamed(LLVMContext &Context, StringRef Name) { StructType *ST = new StructType(Context); - ST->setName(Name); + if (!Name.empty()) + ST->setName(Name); + else + Context.pImpl->EmptyNamedStructTypes.insert(ST); return ST; } @@ -423,11 +426,16 @@ void StructType::setName(StringRef Name) { if (SymbolTableEntry) { getContext().pImpl->NamedStructTypes.erase(getName()); SymbolTableEntry = 0; + } else { + getContext().pImpl->EmptyNamedStructTypes.erase(this); } // If this is just removing the name, we're done. - if (Name.empty()) + if (Name.empty()) { + // Keep track of types with no names so we can free them. + getContext().pImpl->EmptyNamedStructTypes.insert(this); return; + } // Look up the entry for the name. StringMapEntry<StructType*> *Entry = |