BumpPtrAllocator: Have the DefaultSlabAllocator created at runtime, not initialization time. This removes one of the 'init_constructors' reported in <rdar://problem/7545356>.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93581 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ted Kremenek 2010-01-15 23:29:34 +00:00
parent 9a23981ecc
commit 67c59826bf
2 changed files with 6 additions and 4 deletions

View File

@ -128,11 +128,11 @@ class BumpPtrAllocator {
/// one.
void DeallocateSlabs(MemSlab *Slab);
static MallocSlabAllocator DefaultSlabAllocator;
static MallocSlabAllocator &GetDefaultSlabAllocator();
public:
BumpPtrAllocator(size_t size = 4096, size_t threshold = 4096,
SlabAllocator &allocator = DefaultSlabAllocator);
SlabAllocator &allocator = GetDefaultSlabAllocator());
~BumpPtrAllocator();
/// Reset - Deallocate all but the current slab and reset the current pointer

View File

@ -142,8 +142,10 @@ void BumpPtrAllocator::PrintStats() const {
<< " (includes alignment, etc)\n";
}
MallocSlabAllocator BumpPtrAllocator::DefaultSlabAllocator =
MallocSlabAllocator();
MallocSlabAllocator &BumpPtrAllocator::GetDefaultSlabAllocator() {
static MallocSlabAllocator DefaultSlabAllocator;
return DefaultSlabAllocator;
}
SlabAllocator::~SlabAllocator() { }