From 25272096bdc0ceed8de49aa9310feb7cc3ea3744 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Fri, 17 Feb 2017 14:05:49 -0500 Subject: Make mask uintptr_t when calculating alignment. A suggestion from from the code review on cl/7614. TBR=mtklein@google.com Change-Id: Icfbe08bfe63ac1e21ed56481dc5251c2af5bb96a Reviewed-on: https://skia-review.googlesource.com/8674 Reviewed-by: Herb Derby Commit-Queue: Herb Derby --- src/core/SkArenaAlloc.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp index 4146c4f5ec..7f907e669a 100644 --- a/src/core/SkArenaAlloc.cpp +++ b/src/core/SkArenaAlloc.cpp @@ -119,8 +119,7 @@ void SkArenaAlloc::ensureSpace(uint32_t size, uint32_t alignment) { } char* SkArenaAlloc::allocObject(uint32_t size, uint32_t alignment) { - // Must be uint64 to mask 64-bit pointers properly. - uint64_t mask = alignment - 1; + uintptr_t mask = alignment - 1; char* objStart = (char*)((uintptr_t)(fCursor + mask) & ~mask); if ((ptrdiff_t)size > fEnd - objStart) { this->ensureSpace(size, alignment); -- cgit v1.2.3