6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-18 10:31:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix an order-of-deallocation issue where the AttrListImpl could be deallocated before the global

Browse Source 
LLVMContext, causing memory errors.  Patch by Peter Collingbourne.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119721 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2010-11-18 18:59:13 +00:00
parent 27cb5e612a
commit 9fe010ecf8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/VMCore/Attributes.cpp
View File

@ -106,6 +106,11 @@ Attributes Attribute::typeIncompatible(const Type *Ty) {
// AttributeListImpl Definition // AttributeListImpl Definition
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
namespace llvm {
class AttributeListImpl;
}
static ManagedStatic<FoldingSet<AttributeListImpl> > AttributesLists;
namespace llvm { namespace llvm {
static ManagedStatic<sys::SmartMutex<true> > ALMutex; static ManagedStatic<sys::SmartMutex<true> > ALMutex;
@ -131,6 +136,8 @@ public:
} }
void DropRef() { void DropRef() {
sys::SmartScopedLock<true> Lock(*ALMutex); sys::SmartScopedLock<true> Lock(*ALMutex);
if (!AttributesLists.isConstructed())
return;
sys::cas_flag new_val = --RefCount; sys::cas_flag new_val = --RefCount;
if (new_val == 0) if (new_val == 0)
delete this; delete this;
@ -147,8 +154,6 @@ public:
}; };
} }
static ManagedStatic<FoldingSet<AttributeListImpl> > AttributesLists;
AttributeListImpl::~AttributeListImpl() { AttributeListImpl::~AttributeListImpl() {
// NOTE: Lock must be acquired by caller. // NOTE: Lock must be acquired by caller.
AttributesLists->RemoveNode(this); AttributesLists->RemoveNode(this);