[llvm-commits] [llvm] r151842 - in /llvm/trunk: lib/Support/Allocator.cpp unittests/Support/AllocatorTest.cpp
Benjamin Kramer
benny.kra at googlemail.com
Thu Mar 1 14:10:16 PST 2012
Author: d0k
Date: Thu Mar 1 16:10:16 2012
New Revision: 151842
URL: http://llvm.org/viewvc/llvm-project?rev=151842&view=rev
Log:
BumpPtrAllocator: Make sure threshold cannot be initialized with a value smaller than the slab size.
This replaces r151834 with a simpler fix.
Modified:
llvm/trunk/lib/Support/Allocator.cpp
llvm/trunk/unittests/Support/AllocatorTest.cpp
Modified: llvm/trunk/lib/Support/Allocator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Allocator.cpp?rev=151842&r1=151841&r2=151842&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Allocator.cpp (original)
+++ llvm/trunk/lib/Support/Allocator.cpp Thu Mar 1 16:10:16 2012
@@ -22,8 +22,8 @@
BumpPtrAllocator::BumpPtrAllocator(size_t size, size_t threshold,
SlabAllocator &allocator)
- : SlabSize(size), SizeThreshold(threshold), Allocator(allocator),
- CurSlab(0), BytesAllocated(0) { }
+ : SlabSize(size), SizeThreshold(std::min(size, threshold)),
+ Allocator(allocator), CurSlab(0), BytesAllocated(0) { }
BumpPtrAllocator::~BumpPtrAllocator() {
DeallocateSlabs(CurSlab);
@@ -87,21 +87,15 @@
/// Allocate - Allocate space at the specified alignment.
///
void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
- // 0-byte alignment means 1-byte alignment.
- if (Alignment == 0) Alignment = 1;
-
- size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
-
- // If requested size exceeds slab size, increase slab size.
- while (PaddedSize > SlabSize)
- SlabSize *= 2;
-
if (!CurSlab) // Start a new slab if we haven't allocated one already.
StartNewSlab();
// Keep track of how many bytes we've allocated.
BytesAllocated += Size;
+ // 0-byte alignment means 1-byte alignment.
+ if (Alignment == 0) Alignment = 1;
+
// Allocate the aligned space, going forwards from CurPtr.
char *Ptr = AlignPtr(CurPtr, Alignment);
@@ -112,6 +106,7 @@
}
// If Size is really big, allocate a separate slab for it.
+ size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
if (PaddedSize > SizeThreshold) {
MemSlab *NewSlab = Allocator.Allocate(PaddedSize);
Modified: llvm/trunk/unittests/Support/AllocatorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/AllocatorTest.cpp?rev=151842&r1=151841&r2=151842&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/AllocatorTest.cpp (original)
+++ llvm/trunk/unittests/Support/AllocatorTest.cpp Thu Mar 1 16:10:16 2012
@@ -98,7 +98,7 @@
BumpPtrAllocator Alloc(128);
Alloc.Allocate(200, 0);
- EXPECT_EQ(1U, Alloc.GetNumSlabs());
+ EXPECT_EQ(2U, Alloc.GetNumSlabs());
}
// Mock slab allocator that returns slabs aligned on 4096 bytes. There is no
More information about the llvm-commits
mailing list