32b911f96a
This reverts commitf78d69fa5d
. With https://chromium-review.googlesource.com/c/v8/v8/+/2243216, incorrect MemoryChunk::FromHeapObject uses are now fixed. Original change's description: > Revert "[heap] Make ReadOnlySpace use bump pointer allocation" > > This reverts commit81c34968a7
and also >490f3580a3
which depends on the former. > > Reason for revert: Break CFI tests in chromium https://ci.chromium.org/p/chromium/builders/ci/Linux%20CFI/17438 > Original change's description: > > [heap] Make ReadOnlySpace use bump pointer allocation > > > > This changes ReadOnlySpace to no longer be a PagedSpace but instead it > > is now a BaseSpace. BasicSpace is a new base class that Space inherits > > from and which has no allocation methods and does not dictate how the > > pages should be held. > > > > ReadOnlySpace unlike Space holds its pages as a > > std::vector<ReadOnlyPage>, where ReadOnlyPage directly subclasses > > BasicMemoryChunk, meaning they do not have prev_ and next_ pointers and > > cannot be held in a heap::List. This is desirable since with pointer > > compression we would like to remap these pages to different memory > > addresses which would be impossible with a heap::List. > > > > Since ReadOnlySpace no longer uses most of the code from the other > > Spaces it makes sense to simplify its memory allocation to use a simple > > bump pointer and always allocate a new page whenever an allocation > > exceeds the remaining space on the final page. > > > > Change-Id: Iee6d9f96cfb174b4026ee671ee4f897909b38418 > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2209060 > > Commit-Queue: Dan Elphick <delphick@chromium.org> > > Reviewed-by: Ulan Degenbaev <ulan@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#68137} > > TBR=ulan@chromium.org,delphick@chromium.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Change-Id: I68c9834872e55eb833be081f8ff99b786bfa9894 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2232552 > Commit-Queue: Dan Elphick <delphick@chromium.org> > Reviewed-by: Dan Elphick <delphick@chromium.org> > Reviewed-by: Ulan Degenbaev <ulan@chromium.org> > Cr-Commit-Position: refs/heads/master@{#68211} TBR=ulan@chromium.org,delphick@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Id5b3cce41b5dec1dca816c05848d183790b1cc05 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2250254 Reviewed-by: Dan Elphick <delphick@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Dan Elphick <delphick@chromium.org> Cr-Commit-Position: refs/heads/master@{#68407}
123 lines
3.6 KiB
C++
123 lines
3.6 KiB
C++
// Copyright 2019 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "include/v8.h"
|
|
#include "src/api/api-inl.h"
|
|
#include "src/execution/isolate.h"
|
|
#include "src/heap/combined-heap.h"
|
|
#include "src/heap/heap.h"
|
|
#include "src/heap/read-only-heap.h"
|
|
#include "src/heap/read-only-spaces.h"
|
|
#include "src/objects/heap-object.h"
|
|
#include "src/objects/objects.h"
|
|
#include "src/roots/roots-inl.h"
|
|
#include "test/cctest/cctest.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
namespace heap {
|
|
|
|
TEST(HeapObjectIteratorNullPastEnd) {
|
|
HeapObjectIterator iterator(CcTest::heap());
|
|
while (!iterator.Next().is_null()) {
|
|
}
|
|
for (int i = 0; i < 20; i++) {
|
|
CHECK(iterator.Next().is_null());
|
|
}
|
|
}
|
|
|
|
TEST(ReadOnlyHeapObjectIteratorNullPastEnd) {
|
|
ReadOnlyHeapObjectIterator iterator(CcTest::read_only_heap());
|
|
while (!iterator.Next().is_null()) {
|
|
}
|
|
for (int i = 0; i < 20; i++) {
|
|
CHECK(iterator.Next().is_null());
|
|
}
|
|
}
|
|
|
|
TEST(CombinedHeapObjectIteratorNullPastEnd) {
|
|
CombinedHeapObjectIterator iterator(CcTest::heap());
|
|
while (!iterator.Next().is_null()) {
|
|
}
|
|
for (int i = 0; i < 20; i++) {
|
|
CHECK(iterator.Next().is_null());
|
|
}
|
|
}
|
|
|
|
namespace {
|
|
// An arbitrary object guaranteed to live on the non-read-only heap.
|
|
Object CreateWritableObject() {
|
|
return *v8::Utils::OpenHandle(*v8::Object::New(CcTest::isolate()));
|
|
}
|
|
} // namespace
|
|
|
|
TEST(ReadOnlyHeapObjectIterator) {
|
|
CcTest::InitializeVM();
|
|
HandleScope handle_scope(CcTest::i_isolate());
|
|
const Object sample_object = CreateWritableObject();
|
|
ReadOnlyHeapObjectIterator iterator(CcTest::read_only_heap());
|
|
|
|
for (HeapObject obj = iterator.Next(); !obj.is_null();
|
|
obj = iterator.Next()) {
|
|
CHECK(ReadOnlyHeap::Contains(obj));
|
|
CHECK(!CcTest::heap()->Contains(obj));
|
|
CHECK_NE(sample_object, obj);
|
|
}
|
|
}
|
|
|
|
TEST(HeapObjectIterator) {
|
|
CcTest::InitializeVM();
|
|
HandleScope handle_scope(CcTest::i_isolate());
|
|
const Object sample_object = CreateWritableObject();
|
|
HeapObjectIterator iterator(CcTest::heap());
|
|
bool seen_sample_object = false;
|
|
|
|
for (HeapObject obj = iterator.Next(); !obj.is_null();
|
|
obj = iterator.Next()) {
|
|
CHECK(!ReadOnlyHeap::Contains(obj));
|
|
CHECK(CcTest::heap()->Contains(obj));
|
|
if (sample_object == obj) seen_sample_object = true;
|
|
}
|
|
CHECK(seen_sample_object);
|
|
}
|
|
|
|
TEST(CombinedHeapObjectIterator) {
|
|
CcTest::InitializeVM();
|
|
HandleScope handle_scope(CcTest::i_isolate());
|
|
const Object sample_object = CreateWritableObject();
|
|
CombinedHeapObjectIterator iterator(CcTest::heap());
|
|
bool seen_sample_object = false;
|
|
|
|
for (HeapObject obj = iterator.Next(); !obj.is_null();
|
|
obj = iterator.Next()) {
|
|
CHECK(IsValidHeapObject(CcTest::heap(), obj));
|
|
if (sample_object == obj) seen_sample_object = true;
|
|
}
|
|
CHECK(seen_sample_object);
|
|
}
|
|
|
|
TEST(PagedSpaceIterator) {
|
|
Heap* const heap = CcTest::heap();
|
|
PagedSpaceIterator iterator(heap);
|
|
CHECK_EQ(iterator.Next(), reinterpret_cast<PagedSpace*>(heap->old_space()));
|
|
CHECK_EQ(iterator.Next(), reinterpret_cast<PagedSpace*>(heap->code_space()));
|
|
CHECK_EQ(iterator.Next(), reinterpret_cast<PagedSpace*>(heap->map_space()));
|
|
for (int i = 0; i < 20; i++) {
|
|
CHECK_NULL(iterator.Next());
|
|
}
|
|
}
|
|
|
|
TEST(SpaceIterator) {
|
|
auto* const read_only_space = CcTest::read_only_heap()->read_only_space();
|
|
for (SpaceIterator it(CcTest::heap()); it.HasNext();) {
|
|
// ReadOnlySpace is not actually a Space but is instead a BaseSpace, but
|
|
// ensure it's not been inserted incorrectly.
|
|
CHECK_NE(it.Next(), reinterpret_cast<BaseSpace*>(read_only_space));
|
|
}
|
|
}
|
|
|
|
} // namespace heap
|
|
} // namespace internal
|
|
} // namespace v8
|