Bug 1418153 - Rename arena_t::Palloc to arena_t::PallocLarge. r?njn
--- a/memory/build/mozjemalloc.cpp
+++ b/memory/build/mozjemalloc.cpp
@@ -1030,17 +1030,17 @@ private:
inline void* MallocSmall(size_t aSize, bool aZero);
void* MallocLarge(size_t aSize, bool aZero);
public:
inline void* Malloc(size_t aSize, bool aZero);
- void* Palloc(size_t aAlignment, size_t aSize, size_t aAllocSize);
+ void* PallocLarge(size_t aAlignment, size_t aSize, size_t aAllocSize);
inline void DallocSmall(arena_chunk_t* aChunk,
void* aPtr,
arena_chunk_map_t* aMapElm);
void DallocLarge(arena_chunk_t* aChunk, void* aPtr);
void RallocShrinkLarge(arena_chunk_t* aChunk,
@@ -3085,17 +3085,17 @@ imalloc(size_t aSize, bool aZero, arena_
if (aSize <= gMaxLargeClass) {
return aArena->Malloc(aSize, aZero);
}
return huge_malloc(aSize, aZero, aArena);
}
// Only handles large allocations that require more than page alignment.
void*
-arena_t::Palloc(size_t aAlignment, size_t aSize, size_t aAllocSize)
+arena_t::PallocLarge(size_t aAlignment, size_t aSize, size_t aAllocSize)
{
void* ret;
size_t offset;
arena_chunk_t* chunk;
MOZ_ASSERT((aSize & gPageSizeMask) == 0);
MOZ_ASSERT((aAlignment & gPageSizeMask) == 0);
@@ -3211,17 +3211,17 @@ ipalloc(size_t aAlignment, size_t aSize,
// leaves us with a very large run_size. That causes
// the first conditional below to fail, which means
// that the bogus run_size value never gets used for
// anything important.
run_size = (aAlignment << 1) - gPageSize;
}
if (run_size <= gMaxLargeClass) {
- ret = aArena->Palloc(aAlignment, ceil_size, run_size);
+ ret = aArena->PallocLarge(aAlignment, ceil_size, run_size);
} else if (aAlignment <= kChunkSize) {
ret = huge_malloc(ceil_size, false, aArena);
} else {
ret = huge_palloc(ceil_size, aAlignment, false, aArena);
}
}
MOZ_ASSERT((uintptr_t(ret) & (aAlignment - 1)) == 0);