diff options
author | Ted Kremenek <kremenek@apple.com> | 2010-01-15 23:29:34 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2010-01-15 23:29:34 +0000 |
commit | 12821816c661f64623bb9cb507a05bb26ac813d7 (patch) | |
tree | 07aa73d1512d4d76fff2b5967d63e8fbd6e458ca /llvm/lib | |
parent | cb7554a3abbd89699284a5db0a4ebfa720e9cb89 (diff) | |
download | bcm5719-llvm-12821816c661f64623bb9cb507a05bb26ac813d7.tar.gz bcm5719-llvm-12821816c661f64623bb9cb507a05bb26ac813d7.zip |
BumpPtrAllocator: Have the DefaultSlabAllocator created at runtime, not initialization time. This removes one of the 'init_constructors' reported in <rdar://problem/7545356>.
llvm-svn: 93581
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/Support/Allocator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Support/Allocator.cpp b/llvm/lib/Support/Allocator.cpp index 31b45c8d4aa..19d69f6f944 100644 --- a/llvm/lib/Support/Allocator.cpp +++ b/llvm/lib/Support/Allocator.cpp @@ -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() { } |