Index: src/spaces-inl.h |
diff --git a/src/spaces-inl.h b/src/spaces-inl.h |
index 3973658472cdf1343d036a73076074e148999d6a..2ecf9d1f7603b7d61ff4b250cb37abf92bf9ee9e 100644 |
--- a/src/spaces-inl.h |
+++ b/src/spaces-inl.h |
@@ -92,8 +92,10 @@ Address Page::AllocationTop() { |
void Page::ClearRSet() { |
+#ifndef V8_HOST_ARCH_64_BIT |
// This method can be called in all rset states. |
memset(RSetStart(), 0, kRSetEndOffset - kRSetStartOffset); |
+#endif |
} |
@@ -194,7 +196,7 @@ bool MemoryAllocator::IsPageInSpace(Page* p, PagedSpace* space) { |
Page* MemoryAllocator::GetNextPage(Page* p) { |
ASSERT(p->is_valid()); |
- int raw_addr = p->opaque_header & ~Page::kPageAlignmentMask; |
+ intptr_t raw_addr = p->opaque_header & ~Page::kPageAlignmentMask; |
return Page::FromAddress(AddressFrom<Address>(raw_addr)); |
} |
@@ -207,7 +209,7 @@ int MemoryAllocator::GetChunkId(Page* p) { |
void MemoryAllocator::SetNextPage(Page* prev, Page* next) { |
ASSERT(prev->is_valid()); |
- int chunk_id = prev->opaque_header & Page::kPageAlignmentMask; |
+ int chunk_id = GetChunkId(prev); |
ASSERT_PAGE_ALIGNED(next->address()); |
prev->opaque_header = OffsetFrom(next->address()) | chunk_id; |
} |