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

stop leaking all named struct types with an empty name. Thanks

Browse Source 
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
This commit is contained in:
Chris Lattner
2011-07-13 04:22:39 +00:00
parent 3b737081e4
commit c09ef37171
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/VMCore/LLVMContextImpl.cpp
View File

@@ -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;
}

1
lib/VMCore/LLVMContextImpl.h
View File

@@ -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;

12
lib/VMCore/Type.cpp
View File

@@ -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 =