AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Fix 32bit msvc builds

Browse Source 
Size of ActiveSystemPages is 8 bytes even on 32bit builds, thus
forcing 8 bytes alignment for MemoryChunk.

Change-Id: I5ca1e18329d6e68a8b6811c3c27cb224c765cb63
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3966953
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#83845}
This commit is contained in:
Omer Katz 2022-10-20 22:37:33 +02:00 committed by V8 LUCI CQ
parent b2892b5f24
commit 92a7385171
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/heap/memory-chunk-layout.h
View File

@ -37,8 +37,13 @@ using ActiveSystemPages = ::heap::base::ActiveSystemPages;
class V8_EXPORT_PRIVATE MemoryChunkLayout {
public:
static const int kNumSets = NUMBER_OF_REMEMBERED_SET_TYPES;
static const int kNumTypes = ExternalBackingStoreType::kNumTypes;
static constexpr int kNumSets = NUMBER_OF_REMEMBERED_SET_TYPES;
static constexpr int kNumTypes = ExternalBackingStoreType::kNumTypes;
#if V8_CC_MSVC && V8_TARGET_ARCH_IA32
static constexpr int kMemoryChunkAlignment = 8;
#else
static constexpr int kMemoryChunkAlignment = sizeof(size_t);
#endif // V8_CC_MSVC && V8_TARGET_ARCH_IA32
#define FIELD(Type, Name) \
k##Name##Offset, k##Name##End = k##Name##Offset + sizeof(Type) - 1
enum Header {
@ -74,11 +79,17 @@ class V8_EXPORT_PRIVATE MemoryChunkLayout {
#endif // V8_ENABLE_INNER_POINTER_RESOLUTION_OSB
FIELD(size_t, WasUsedForAllocation),
kMarkingBitmapOffset,
kMemoryChunkHeaderSize = kMarkingBitmapOffset,
kMemoryChunkHeaderSize =
kMarkingBitmapOffset +
((kMarkingBitmapOffset % kMemoryChunkAlignment) == 0
? 0
: kMemoryChunkAlignment -
(kMarkingBitmapOffset % kMemoryChunkAlignment)),
kMemoryChunkHeaderStart = kSlotSetOffset,
kBasicMemoryChunkHeaderSize = kMemoryChunkHeaderStart,
kBasicMemoryChunkHeaderStart = 0,
};
#undef FIELD
static size_t CodePageGuardStartOffset();
static size_t CodePageGuardSize();
static intptr_t ObjectStartOffsetInCodePage();

11
src/heap/memory-chunk.cc
View File

@ -512,6 +512,17 @@ void MemoryChunk::ValidateOffsets(MemoryChunk* chunk) {
DCHECK_EQ(reinterpret_cast<Address>(&chunk->possibly_empty_buckets_) -
chunk->address(),
MemoryChunkLayout::kPossiblyEmptyBucketsOffset);
DCHECK_EQ(reinterpret_cast<Address>(&chunk->active_system_pages_) -
chunk->address(),
MemoryChunkLayout::kActiveSystemPagesOffset);
#ifdef V8_ENABLE_INNER_POINTER_RESOLUTION_OSB
DCHECK_EQ(reinterpret_cast<Address>(&chunk->object_start_bitmap_) -
chunk->address(),
MemoryChunkLayout::kObjectStartBitmapOffset);
#endif // V8_ENABLE_INNER_POINTER_RESOLUTION_OSB
DCHECK_EQ(reinterpret_cast<Address>(&chunk->was_used_for_allocation_) -
chunk->address(),
MemoryChunkLayout::kWasUsedForAllocationOffset);
}
#endif