summaryrefslogtreecommitdiffstats
path: root/chromium/v8/src/heap/cppgc/heap-page.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/heap/cppgc/heap-page.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/heap/cppgc/heap-page.cc')
-rw-r--r--chromium/v8/src/heap/cppgc/heap-page.cc141
1 files changed, 100 insertions, 41 deletions
diff --git a/chromium/v8/src/heap/cppgc/heap-page.cc b/chromium/v8/src/heap/cppgc/heap-page.cc
index e8afbafbd2a..f95f4a37eb6 100644
--- a/chromium/v8/src/heap/cppgc/heap-page.cc
+++ b/chromium/v8/src/heap/cppgc/heap-page.cc
@@ -14,7 +14,7 @@
#include "src/heap/cppgc/heap.h"
#include "src/heap/cppgc/object-start-bitmap-inl.h"
#include "src/heap/cppgc/object-start-bitmap.h"
-#include "src/heap/cppgc/page-memory.h"
+#include "src/heap/cppgc/page-memory-inl.h"
#include "src/heap/cppgc/raw-heap.h"
namespace cppgc {
@@ -27,63 +27,120 @@ Address AlignAddress(Address address, size_t alignment) {
RoundUp(reinterpret_cast<uintptr_t>(address), alignment));
}
-} // namespace
+const HeapObjectHeader* ObjectHeaderFromInnerAddressImpl(const BasePage* page,
+ const void* address) {
+ if (page->is_large()) {
+ return LargePage::From(page)->ObjectHeader();
+ }
+ const ObjectStartBitmap& bitmap =
+ NormalPage::From(page)->object_start_bitmap();
+ const HeapObjectHeader* header =
+ bitmap.FindHeader(static_cast<ConstAddress>(address));
+ DCHECK_LT(address,
+ reinterpret_cast<ConstAddress>(header) +
+ header->GetSize<HeapObjectHeader::AccessMode::kAtomic>());
+ return header;
+}
-STATIC_ASSERT(kPageSize == api_constants::kPageAlignment);
+} // namespace
// static
-BasePage* BasePage::FromPayload(void* payload) {
- return reinterpret_cast<BasePage*>(
- (reinterpret_cast<uintptr_t>(payload) & kPageBaseMask) + kGuardPageSize);
+BasePage* BasePage::FromInnerAddress(const HeapBase* heap, void* address) {
+ return const_cast<BasePage*>(
+ FromInnerAddress(heap, const_cast<const void*>(address)));
}
// static
-const BasePage* BasePage::FromPayload(const void* payload) {
+const BasePage* BasePage::FromInnerAddress(const HeapBase* heap,
+ const void* address) {
return reinterpret_cast<const BasePage*>(
- (reinterpret_cast<uintptr_t>(const_cast<void*>(payload)) &
- kPageBaseMask) +
- kGuardPageSize);
+ heap->page_backend()->Lookup(static_cast<ConstAddress>(address)));
}
-HeapObjectHeader* BasePage::ObjectHeaderFromInnerAddress(void* address) {
- return const_cast<HeapObjectHeader*>(
+// static
+void BasePage::Destroy(BasePage* page) {
+ if (page->is_large()) {
+ LargePage::Destroy(LargePage::From(page));
+ } else {
+ NormalPage::Destroy(NormalPage::From(page));
+ }
+}
+
+Address BasePage::PayloadStart() {
+ return is_large() ? LargePage::From(this)->PayloadStart()
+ : NormalPage::From(this)->PayloadStart();
+}
+
+ConstAddress BasePage::PayloadStart() const {
+ return const_cast<BasePage*>(this)->PayloadStart();
+}
+
+Address BasePage::PayloadEnd() {
+ return is_large() ? LargePage::From(this)->PayloadEnd()
+ : NormalPage::From(this)->PayloadEnd();
+}
+
+ConstAddress BasePage::PayloadEnd() const {
+ return const_cast<BasePage*>(this)->PayloadEnd();
+}
+
+HeapObjectHeader& BasePage::ObjectHeaderFromInnerAddress(void* address) const {
+ return const_cast<HeapObjectHeader&>(
ObjectHeaderFromInnerAddress(const_cast<const void*>(address)));
}
-const HeapObjectHeader* BasePage::ObjectHeaderFromInnerAddress(
- const void* address) {
+const HeapObjectHeader& BasePage::ObjectHeaderFromInnerAddress(
+ const void* address) const {
+ const HeapObjectHeader* header =
+ ObjectHeaderFromInnerAddressImpl(this, address);
+ DCHECK_NE(kFreeListGCInfoIndex, header->GetGCInfoIndex());
+ return *header;
+}
+
+HeapObjectHeader* BasePage::TryObjectHeaderFromInnerAddress(
+ void* address) const {
+ return const_cast<HeapObjectHeader*>(
+ TryObjectHeaderFromInnerAddress(const_cast<const void*>(address)));
+}
+
+const HeapObjectHeader* BasePage::TryObjectHeaderFromInnerAddress(
+ const void* address) const {
if (is_large()) {
- return LargePage::From(this)->ObjectHeader();
+ if (!LargePage::From(this)->PayloadContains(
+ static_cast<ConstAddress>(address)))
+ return nullptr;
+ } else {
+ const NormalPage* normal_page = NormalPage::From(this);
+ if (!normal_page->PayloadContains(static_cast<ConstAddress>(address)))
+ return nullptr;
+ // Check that the space has no linear allocation buffer.
+ DCHECK(!NormalPageSpace::From(normal_page->space())
+ ->linear_allocation_buffer()
+ .size());
}
- ObjectStartBitmap& bitmap = NormalPage::From(this)->object_start_bitmap();
- HeapObjectHeader* header =
- bitmap.FindHeader(static_cast<ConstAddress>(address));
- DCHECK_LT(address,
- reinterpret_cast<ConstAddress>(header) +
- header->GetSize<HeapObjectHeader::AccessMode::kAtomic>());
- DCHECK_NE(kFreeListGCInfoIndex,
- header->GetGCInfoIndex<HeapObjectHeader::AccessMode::kAtomic>());
+
+ // |address| is on the heap, so we FromInnerAddress can get the header.
+ const HeapObjectHeader* header =
+ ObjectHeaderFromInnerAddressImpl(this, address);
+ if (header->IsFree()) return nullptr;
+ DCHECK_NE(kFreeListGCInfoIndex, header->GetGCInfoIndex());
return header;
}
-BasePage::BasePage(Heap* heap, BaseSpace* space, PageType type)
+BasePage::BasePage(HeapBase* heap, BaseSpace* space, PageType type)
: heap_(heap), space_(space), type_(type) {
DCHECK_EQ(0u, (reinterpret_cast<uintptr_t>(this) - kGuardPageSize) &
kPageOffsetMask);
- DCHECK_EQ(reinterpret_cast<void*>(&heap_),
- FromPayload(this) + api_constants::kHeapOffset);
DCHECK_EQ(&heap_->raw_heap(), space_->raw_heap());
}
// static
-NormalPage* NormalPage::Create(NormalPageSpace* space) {
- DCHECK(space);
- Heap* heap = space->raw_heap()->heap();
- DCHECK(heap);
- void* memory = heap->page_backend()->AllocateNormalPageMemory(space->index());
- auto* normal_page = new (memory) NormalPage(heap, space);
- space->AddPage(normal_page);
- space->AddToFreeList(normal_page->PayloadStart(), normal_page->PayloadSize());
+NormalPage* NormalPage::Create(PageBackend* page_backend,
+ NormalPageSpace* space) {
+ DCHECK_NOT_NULL(page_backend);
+ DCHECK_NOT_NULL(space);
+ void* memory = page_backend->AllocateNormalPageMemory(space->index());
+ auto* normal_page = new (memory) NormalPage(space->raw_heap()->heap(), space);
return normal_page;
}
@@ -98,7 +155,7 @@ void NormalPage::Destroy(NormalPage* page) {
reinterpret_cast<Address>(page));
}
-NormalPage::NormalPage(Heap* heap, BaseSpace* space)
+NormalPage::NormalPage(HeapBase* heap, BaseSpace* space)
: BasePage(heap, space, PageType::kNormal),
object_start_bitmap_(PayloadStart()) {
DCHECK_LT(kLargeObjectSizeThreshold,
@@ -142,23 +199,25 @@ size_t NormalPage::PayloadSize() {
return kPageSize - 2 * kGuardPageSize - header_size;
}
-LargePage::LargePage(Heap* heap, BaseSpace* space, size_t size)
+LargePage::LargePage(HeapBase* heap, BaseSpace* space, size_t size)
: BasePage(heap, space, PageType::kLarge), payload_size_(size) {}
LargePage::~LargePage() = default;
// static
-LargePage* LargePage::Create(LargePageSpace* space, size_t size) {
- DCHECK(space);
+LargePage* LargePage::Create(PageBackend* page_backend, LargePageSpace* space,
+ size_t size) {
+ DCHECK_NOT_NULL(page_backend);
+ DCHECK_NOT_NULL(space);
DCHECK_LE(kLargeObjectSizeThreshold, size);
+
const size_t page_header_size =
RoundUp(sizeof(LargePage), kAllocationGranularity);
const size_t allocation_size = page_header_size + size;
- Heap* heap = space->raw_heap()->heap();
- void* memory = heap->page_backend()->AllocateLargePageMemory(allocation_size);
+ auto* heap = space->raw_heap()->heap();
+ void* memory = page_backend->AllocateLargePageMemory(allocation_size);
LargePage* page = new (memory) LargePage(heap, space, size);
- space->AddPage(page);
return page;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 19:19:07 +0000