Temporarily revert r93581. It was causing failures in the ExecutionEngine tests

[oota-llvm.git] / lib / Support / Allocator.cpp

diff --git a/lib/Support/Allocator.cpp b/lib/Support/Allocator.cpp
index e302f0bf863cee1e4647ca26646a4fabb9e057b1..31b45c8d4aae77538940f8f1b9e948f7f2726e23 100644 (file)
--- a/lib/Support/Allocator.cpp
+++ b/lib/Support/Allocator.cpp
@@ -12,9 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Allocator.h"
+#include "llvm/System/DataTypes.h"
 #include "llvm/Support/Recycler.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/Streams.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/System/Memory.h"
 #include <cstring>
 
 namespace llvm {
@@ -49,7 +50,7 @@ void BumpPtrAllocator::StartNewSlab() {
   NewSlab->NextPtr = CurSlab;
   CurSlab = NewSlab;
   CurPtr = (char*)(CurSlab + 1);
-  End = CurPtr + CurSlab->Size;
+  End = ((char*)CurSlab) + CurSlab->Size;
 }
 
 /// DeallocateSlabs - Deallocate all memory slabs after and including this
@@ -60,6 +61,7 @@ void BumpPtrAllocator::DeallocateSlabs(MemSlab *Slab) {
 #ifndef NDEBUG
     // Poison the memory so stale pointers crash sooner.  Note we must
     // preserve the Size and NextPtr fields at the beginning.
+    sys::Memory::setRangeWritable(Slab + 1, Slab->Size - sizeof(MemSlab));
     memset(Slab + 1, 0xCD, Slab->Size - sizeof(MemSlab));
 #endif
     Allocator.Deallocate(Slab);
@@ -73,7 +75,7 @@ void BumpPtrAllocator::Reset() {
   DeallocateSlabs(CurSlab->NextPtr);
   CurSlab->NextPtr = 0;
   CurPtr = (char*)(CurSlab + 1);
-  End = CurPtr + CurSlab->Size;
+  End = ((char*)CurSlab) + CurSlab->Size;
 }
 
 /// Allocate - Allocate space at the specified alignment.
@@ -89,14 +91,14 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
   char *Ptr = AlignPtr(CurPtr, Alignment);
 
   // Check if we can hold it.
-  if (Ptr + Size < End) {
+  if (Ptr + Size <= End) {
     CurPtr = Ptr + Size;
     return Ptr;
   }
 
   // If Size is really big, allocate a separate slab for it.
-  if (Size > SizeThreshold) {
-    size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
+  size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
+  if (PaddedSize > SizeThreshold) {
     MemSlab *NewSlab = Allocator.Allocate(PaddedSize);
 
     // Put the new slab after the current slab, since we are not allocating
@@ -105,7 +107,7 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
     CurSlab->NextPtr = NewSlab;
 
     Ptr = AlignPtr((char*)(NewSlab + 1), Alignment);
-    assert((uintptr_t)Ptr + Size < (uintptr_t)NewSlab + NewSlab->Size);
+    assert((uintptr_t)Ptr + Size <= (uintptr_t)NewSlab + NewSlab->Size);
     return Ptr;
   }
 
@@ -113,7 +115,7 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
   StartNewSlab();
   Ptr = AlignPtr(CurPtr, Alignment);
   CurPtr = Ptr + Size;
-  assert(CurPtr < End && "Unable to allocate memory!");
+  assert(CurPtr <= End && "Unable to allocate memory!");
   return Ptr;
 }
 
@@ -133,11 +135,11 @@ void BumpPtrAllocator::PrintStats() const {
     ++NumSlabs;
   }
 
-  cerr << "\nNumber of memory regions: " << NumSlabs << '\n'
-       << "Bytes used: " << BytesAllocated << '\n'
-       << "Bytes allocated: " << TotalMemory << '\n'
-       << "Bytes wasted: " << (TotalMemory - BytesAllocated)
-       << " (includes alignment, etc)\n";
+  errs() << "\nNumber of memory regions: " << NumSlabs << '\n'
+         << "Bytes used: " << BytesAllocated << '\n'
+         << "Bytes allocated: " << TotalMemory << '\n'
+         << "Bytes wasted: " << (TotalMemory - BytesAllocated)
+         << " (includes alignment, etc)\n";
 }
 
 MallocSlabAllocator BumpPtrAllocator::DefaultSlabAllocator =
@@ -161,9 +163,9 @@ void MallocSlabAllocator::Deallocate(MemSlab *Slab) {
 void PrintRecyclerStats(size_t Size,
                         size_t Align,
                         size_t FreeListSize) {
-  cerr << "Recycler element size: " << Size << '\n'
-       << "Recycler element alignment: " << Align << '\n'
-       << "Number of elements free for recycling: " << FreeListSize << '\n';
+  errs() << "Recycler element size: " << Size << '\n'
+         << "Recycler element alignment: " << Align << '\n'
+         << "Number of elements free for recycling: " << FreeListSize << '\n';
 }
 
 }