diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/heap/concurrent-allocator-inl.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
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/concurrent-allocator-inl.h')
| -rw-r--r-- | chromium/v8/src/heap/concurrent-allocator-inl.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chromium/v8/src/heap/concurrent-allocator-inl.h b/chromium/v8/src/heap/concurrent-allocator-inl.h index 65f1be313f8..15a4ef5f89c 100644 --- a/chromium/v8/src/heap/concurrent-allocator-inl.h +++ b/chromium/v8/src/heap/concurrent-allocator-inl.h @@ -8,8 +8,8 @@ #include "include/v8-internal.h" #include "src/common/globals.h" #include "src/heap/concurrent-allocator.h" - #include "src/heap/heap.h" +#include "src/heap/incremental-marking.h" #include "src/heap/spaces-inl.h" #include "src/heap/spaces.h" #include "src/objects/heap-object.h" @@ -23,15 +23,7 @@ AllocationResult ConcurrentAllocator::Allocate(int object_size, // TODO(dinfuehr): Add support for allocation observers CHECK(FLAG_concurrent_allocation); if (object_size > kMaxLabObjectSize) { - auto result = space_->SlowGetLinearAllocationAreaBackground( - local_heap_, object_size, object_size, alignment, origin); - - if (result) { - HeapObject object = HeapObject::FromAddress(result->first); - return AllocationResult(object); - } else { - return AllocationResult::Retry(OLD_SPACE); - } + return AllocateOutsideLab(object_size, alignment, origin); } return AllocateInLab(object_size, alignment, origin); @@ -69,6 +61,12 @@ bool ConcurrentAllocator::EnsureLab(AllocationOrigin origin) { if (!result) return false; + if (local_heap_->heap()->incremental_marking()->black_allocation()) { + Address top = result->first; + Address limit = top + result->second; + Page::FromAllocationAreaAddress(top)->CreateBlackAreaBackground(top, limit); + } + HeapObject object = HeapObject::FromAddress(result->first); LocalAllocationBuffer saved_lab = std::move(lab_); lab_ = LocalAllocationBuffer::FromResult( |