diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2008-07-29 07:38:32 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2008-07-29 07:38:32 +0000 |
| commit | bf83579b30e6bb8248c13cc166f87986465299c6 (patch) | |
| tree | dc688ff2025899c15a09dcacc54e2faa58be8bb3 /llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp | |
| parent | 373351725f4ec8087b2eb19999449e623815711c (diff) | |
| download | bcm5719-llvm-bf83579b30e6bb8248c13cc166f87986465299c6.tar.gz bcm5719-llvm-bf83579b30e6bb8248c13cc166f87986465299c6.zip | |
Fix for PR2578. Do not split off a block whose size is less than FreeRangeHeader::getMinBlockSize(). Patch by Damien.
llvm-svn: 54152
Diffstat (limited to 'llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp b/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp index 4cbfcf9e518..248291634cc 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp @@ -202,6 +202,9 @@ TrimAllocationToSize(FreeRangeHeader *FreeList, uint64_t NewSize) { assert(ThisAllocated && getBlockAfter().PrevAllocated && "Cannot deallocate part of an allocated block!"); + // Don't allow blocks to be trimmed below minimum required size + NewSize = std::max<uint64_t>(FreeRangeHeader::getMinBlockSize(), NewSize); + // Round up size for alignment of header. unsigned HeaderAlign = __alignof(FreeRangeHeader); NewSize = (NewSize+ (HeaderAlign-1)) & ~(HeaderAlign-1); |
