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

[offthread] Make Heap::AlignWithFiller static

Browse Source 
Enable the use of Heap::AlignWithFiller off-thread by making the method
static.

Bug: chromium:1075999
Change-Id: I8071ae678f954dd4e960b2cd83f63dd22a948920
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2184230
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67602}
This commit is contained in:
Leszek Swirski 2020-05-06 11:37:39 +02:00 committed by Commit Bot
parent c64b52a892
commit bc2bc6bf72
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/heap/heap.cc
View File

@ -2848,7 +2848,7 @@ int Heap::GetMaximumFillToAlign(AllocationAlignment alignment) {
return 0;
}
// static
int Heap::GetFillToAlign(Address address, AllocationAlignment alignment) {
if (alignment == kDoubleAligned && (address & kDoubleAlignmentMask) != 0)
return kTaggedSize;
@ -2861,24 +2861,28 @@ size_t Heap::GetCodeRangeReservedAreaSize() {
return kReservedCodeRangePages * MemoryAllocator::GetCommitPageSize();
}
HeapObject Heap::PrecedeWithFiller(HeapObject object, int filler_size) {
CreateFillerObjectAt(object.address(), filler_size, ClearRecordedSlots::kNo);
// static
HeapObject Heap::PrecedeWithFiller(ReadOnlyRoots roots, HeapObject object,
int filler_size) {
CreateFillerObjectAt(roots, object.address(), filler_size,
ClearFreedMemoryMode::kDontClearFreedMemory);
return HeapObject::FromAddress(object.address() + filler_size);
}
HeapObject Heap::AlignWithFiller(HeapObject object, int object_size,
int allocation_size,
// static
HeapObject Heap::AlignWithFiller(ReadOnlyRoots roots, HeapObject object,
int object_size, int allocation_size,
AllocationAlignment alignment) {
int filler_size = allocation_size - object_size;
DCHECK_LT(0, filler_size);
int pre_filler = GetFillToAlign(object.address(), alignment);
if (pre_filler) {
object = PrecedeWithFiller(object, pre_filler);
object = PrecedeWithFiller(roots, object, pre_filler);
filler_size -= pre_filler;
}
if (filler_size) {
CreateFillerObjectAt(object.address() + object_size, filler_size,
ClearRecordedSlots::kNo);
CreateFillerObjectAt(roots, object.address() + object_size, filler_size,
ClearFreedMemoryMode::kDontClearFreedMemory);
}
return object;
}

10
src/heap/heap.h
View File

@ -1330,15 +1330,15 @@ class Heap {
// ===========================================================================
// Creates a filler object and returns a heap object immediately after it.
V8_EXPORT_PRIVATE V8_WARN_UNUSED_RESULT HeapObject
PrecedeWithFiller(HeapObject object, int filler_size);
V8_EXPORT_PRIVATE static V8_WARN_UNUSED_RESULT HeapObject
PrecedeWithFiller(ReadOnlyRoots roots, HeapObject object, int filler_size);
// Creates a filler object if needed for alignment and returns a heap object
// immediately after it. If any space is left after the returned object,
// another filler object is created so the over allocated memory is iterable.
V8_WARN_UNUSED_RESULT HeapObject
AlignWithFiller(HeapObject object, int object_size, int allocation_size,
AllocationAlignment alignment);
static V8_WARN_UNUSED_RESULT HeapObject
AlignWithFiller(ReadOnlyRoots roots, HeapObject object, int object_size,
int allocation_size, AllocationAlignment alignment);
// Allocate an external backing store with the given allocation callback.
// If the callback fails (indicated by a nullptr result) then this function

12
src/heap/spaces-inl.h
View File

@ -335,8 +335,9 @@ AllocationResult LocalAllocationBuffer::AllocateRawAligned(
allocation_info_.set_top(new_top);
if (filler_size > 0) {
return heap_->PrecedeWithFiller(HeapObject::FromAddress(current_top),
filler_size);
return Heap::PrecedeWithFiller(ReadOnlyRoots(heap_),
HeapObject::FromAddress(current_top),
filler_size);
}
return AllocationResult(HeapObject::FromAddress(current_top));
@ -369,8 +370,9 @@ HeapObject PagedSpace::TryAllocateLinearlyAligned(
allocation_info_.set_top(new_top);
if (filler_size > 0) {
*size_in_bytes += filler_size;
return heap()->PrecedeWithFiller(HeapObject::FromAddress(current_top),
filler_size);
return Heap::PrecedeWithFiller(ReadOnlyRoots(heap()),
HeapObject::FromAddress(current_top),
filler_size);
}
return HeapObject::FromAddress(current_top);
@ -484,7 +486,7 @@ AllocationResult NewSpace::AllocateRawAligned(int size_in_bytes,
DCHECK_SEMISPACE_ALLOCATION_INFO(allocation_info_, to_space_);
if (filler_size > 0) {
obj = heap()->PrecedeWithFiller(obj, filler_size);
obj = Heap::PrecedeWithFiller(ReadOnlyRoots(heap()), obj, filler_size);
}
MSAN_ALLOCATED_UNINITIALIZED_MEMORY(obj.address(), size_in_bytes);

3
src/snapshot/deserializer-allocator.cc
View File

@ -85,7 +85,8 @@ Address DeserializerAllocator::Allocate(SnapshotSpace space, int size) {
DCHECK(ReadOnlyRoots(heap_).free_space_map().IsMap());
DCHECK(ReadOnlyRoots(heap_).one_pointer_filler_map().IsMap());
DCHECK(ReadOnlyRoots(heap_).two_pointer_filler_map().IsMap());
obj = heap_->AlignWithFiller(obj, size, reserved, next_alignment_);
obj = Heap::AlignWithFiller(ReadOnlyRoots(heap_), obj, size, reserved,
next_alignment_);
address = obj.address();
next_alignment_ = kWordAligned;
return address;