[llvm-commits] [llvm] r93606 - in /llvm/trunk: include/llvm/Support/Allocator.h lib/Support/Allocator.cpp

[Bill Wendling]

Author: void
Date: Fri Jan 15 19:06:58 2010
New Revision: 93606

URL: http://llvm.org/viewvc/llvm-project?rev=93606&view=rev
Log:
Temporarily revert r93581. It was causing failures in the ExecutionEngine tests
on the build bots.

Modified:
    llvm/trunk/include/llvm/Support/Allocator.h
    llvm/trunk/lib/Support/Allocator.cpp

Modified: llvm/trunk/include/llvm/Support/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Allocator.h?rev=93606&r1=93605&r2=93606&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/Allocator.h (original)
+++ llvm/trunk/include/llvm/Support/Allocator.h Fri Jan 15 19:06:58 2010
@@ -128,11 +128,11 @@
   /// one.
   void DeallocateSlabs(MemSlab *Slab);
 
-  static MallocSlabAllocator &GetDefaultSlabAllocator();
+  static MallocSlabAllocator DefaultSlabAllocator;
 
 public:
   BumpPtrAllocator(size_t size = 4096, size_t threshold = 4096,
-                   SlabAllocator &allocator = GetDefaultSlabAllocator());
+                   SlabAllocator &allocator = DefaultSlabAllocator);
   ~BumpPtrAllocator();
 
   /// Reset - Deallocate all but the current slab and reset the current pointer

Modified: llvm/trunk/lib/Support/Allocator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Allocator.cpp?rev=93606&r1=93605&r2=93606&view=diff

==============================================================================
--- llvm/trunk/lib/Support/Allocator.cpp (original)
+++ llvm/trunk/lib/Support/Allocator.cpp Fri Jan 15 19:06:58 2010
@@ -142,10 +142,8 @@
          << " (includes alignment, etc)\n";
 }
 
-MallocSlabAllocator &BumpPtrAllocator::GetDefaultSlabAllocator() {
-  static MallocSlabAllocator DefaultSlabAllocator;
-  return DefaultSlabAllocator;
-}
+MallocSlabAllocator BumpPtrAllocator::DefaultSlabAllocator =
+  MallocSlabAllocator();
 
 SlabAllocator::~SlabAllocator() { }