diff options
Diffstat (limited to 'llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp b/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp index fbbb29e9164a..36067ccf2753 100644 --- a/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp +++ b/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp @@ -113,10 +113,12 @@ InProcessMemoryManager::allocate(const JITLinkDylib *JD, uint64_t SegmentSize = alignTo(Seg.getContentSize() + Seg.getZeroFillSize(), sys::Process::getPageSizeEstimate()); + assert(SlabRemaining.allocatedSize() >= SegmentSize && + "Mapping exceeds allocation"); sys::MemoryBlock SegMem(SlabRemaining.base(), SegmentSize); SlabRemaining = sys::MemoryBlock((char *)SlabRemaining.base() + SegmentSize, - SegmentSize); + SlabRemaining.allocatedSize() - SegmentSize); // Zero out the zero-fill memory. memset(static_cast<char *>(SegMem.base()) + Seg.getContentSize(), 0, @@ -125,6 +127,7 @@ InProcessMemoryManager::allocate(const JITLinkDylib *JD, // Record the block for this segment. Blocks[KV.first] = std::move(SegMem); } + return std::unique_ptr<InProcessMemoryManager::Allocation>( new IPMMAlloc(std::move(Blocks))); } |