431abca0ca
This reverts commit 8196e10265
.
Reason for revert: Performance regression due to hashcode lookup.
Original change's description:
> [builtins] Move most WeakMap/WeakSet code from JS to C++ builtins
>
> They were already implemented mostly in C++ (only error/negative
> cases were handled in script), so this is mostly just a cleanup.
> Only the constructors remain in script after this CL.
>
> Bug: v8:6354
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
> Change-Id: I5b3579337a8e33dc30d49c2da5cfd42baec697bb
> Reviewed-on: https://chromium-review.googlesource.com/531670
> Reviewed-by: Camillo Bruni <cbruni@chromium.org>
> Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org>
> Commit-Queue: Adam Klein <adamk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#45924}
TBR=adamk@chromium.org,cbruni@chromium.org,gsathya@chromium.org
Bug: v8:6354, chromium:733238
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
Change-Id: Ia5a741b9587886298f3ca057f6a6adeba556b8e0
Reviewed-on: https://chromium-review.googlesource.com/537207
Reviewed-by: Adam Klein <adamk@chromium.org>
Commit-Queue: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45966}
245 lines
9.1 KiB
C++
245 lines
9.1 KiB
C++
// Copyright 2011 the V8 project authors. All rights reserved.
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following
|
|
// disclaimer in the documentation and/or other materials provided
|
|
// with the distribution.
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived
|
|
// from this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#include <utility>
|
|
|
|
#include "src/v8.h"
|
|
|
|
#include "src/factory.h"
|
|
#include "src/global-handles.h"
|
|
#include "src/isolate.h"
|
|
// FIXME(mstarzinger, marja): This is weird, but required because of the missing
|
|
// (disallowed) include: src/factory.h -> src/objects-inl.h
|
|
#include "src/objects-inl.h"
|
|
// FIXME(mstarzinger, marja): This is weird, but required because of the missing
|
|
// (disallowed) include: src/feedback-vector.h ->
|
|
// src/feedback-vector-inl.h
|
|
#include "src/feedback-vector-inl.h"
|
|
#include "test/cctest/cctest.h"
|
|
#include "test/cctest/heap/heap-utils.h"
|
|
|
|
using namespace v8::internal;
|
|
|
|
static Isolate* GetIsolateFrom(LocalContext* context) {
|
|
return reinterpret_cast<Isolate*>((*context)->GetIsolate());
|
|
}
|
|
|
|
|
|
static Handle<JSWeakSet> AllocateJSWeakSet(Isolate* isolate) {
|
|
Factory* factory = isolate->factory();
|
|
Handle<Map> map = factory->NewMap(JS_WEAK_SET_TYPE, JSWeakSet::kSize);
|
|
Handle<JSObject> weakset_obj = factory->NewJSObjectFromMap(map);
|
|
Handle<JSWeakSet> weakset(JSWeakSet::cast(*weakset_obj));
|
|
// Do not leak handles for the hash table, it would make entries strong.
|
|
{
|
|
HandleScope scope(isolate);
|
|
Handle<ObjectHashTable> table = ObjectHashTable::New(isolate, 1);
|
|
weakset->set_table(*table);
|
|
}
|
|
return weakset;
|
|
}
|
|
|
|
static int NumberOfWeakCalls = 0;
|
|
static void WeakPointerCallback(const v8::WeakCallbackInfo<void>& data) {
|
|
std::pair<v8::Persistent<v8::Value>*, int>* p =
|
|
reinterpret_cast<std::pair<v8::Persistent<v8::Value>*, int>*>(
|
|
data.GetParameter());
|
|
CHECK_EQ(1234, p->second);
|
|
NumberOfWeakCalls++;
|
|
p->first->Reset();
|
|
}
|
|
|
|
|
|
TEST(WeakSet_Weakness) {
|
|
FLAG_incremental_marking = false;
|
|
LocalContext context;
|
|
Isolate* isolate = GetIsolateFrom(&context);
|
|
Factory* factory = isolate->factory();
|
|
HandleScope scope(isolate);
|
|
Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
|
|
GlobalHandles* global_handles = isolate->global_handles();
|
|
|
|
// Keep global reference to the key.
|
|
Handle<Object> key;
|
|
{
|
|
HandleScope scope(isolate);
|
|
Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
|
|
Handle<JSObject> object = factory->NewJSObjectFromMap(map);
|
|
key = global_handles->Create(*object);
|
|
}
|
|
CHECK(!global_handles->IsWeak(key.location()));
|
|
|
|
// Put entry into weak set.
|
|
{
|
|
HandleScope scope(isolate);
|
|
Handle<Smi> smi(Smi::FromInt(23), isolate);
|
|
int32_t hash = Object::GetOrCreateHash(isolate, key)->value();
|
|
JSWeakCollection::Set(weakset, key, smi, hash);
|
|
}
|
|
CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements());
|
|
|
|
// Force a full GC.
|
|
CcTest::CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
CHECK_EQ(0, NumberOfWeakCalls);
|
|
CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements());
|
|
CHECK_EQ(
|
|
0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
|
|
|
|
// Make the global reference to the key weak.
|
|
std::pair<Handle<Object>*, int> handle_and_id(&key, 1234);
|
|
GlobalHandles::MakeWeak(
|
|
key.location(), reinterpret_cast<void*>(&handle_and_id),
|
|
&WeakPointerCallback, v8::WeakCallbackType::kParameter);
|
|
CHECK(global_handles->IsWeak(key.location()));
|
|
|
|
CcTest::CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
CHECK_EQ(1, NumberOfWeakCalls);
|
|
CHECK_EQ(0, ObjectHashTable::cast(weakset->table())->NumberOfElements());
|
|
CHECK_EQ(
|
|
1, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
|
|
}
|
|
|
|
|
|
TEST(WeakSet_Shrinking) {
|
|
LocalContext context;
|
|
Isolate* isolate = GetIsolateFrom(&context);
|
|
Factory* factory = isolate->factory();
|
|
HandleScope scope(isolate);
|
|
Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
|
|
|
|
// Check initial capacity.
|
|
CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity());
|
|
|
|
// Fill up weak set to trigger capacity change.
|
|
{
|
|
HandleScope scope(isolate);
|
|
Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
|
|
for (int i = 0; i < 32; i++) {
|
|
Handle<JSObject> object = factory->NewJSObjectFromMap(map);
|
|
Handle<Smi> smi(Smi::FromInt(i), isolate);
|
|
int32_t hash = Object::GetOrCreateHash(isolate, object)->value();
|
|
JSWeakCollection::Set(weakset, object, smi, hash);
|
|
}
|
|
}
|
|
|
|
// Check increased capacity.
|
|
CHECK_EQ(128, ObjectHashTable::cast(weakset->table())->Capacity());
|
|
|
|
// Force a full GC.
|
|
CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->NumberOfElements());
|
|
CHECK_EQ(
|
|
0, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
|
|
CcTest::CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
CHECK_EQ(0, ObjectHashTable::cast(weakset->table())->NumberOfElements());
|
|
CHECK_EQ(
|
|
32, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
|
|
|
|
// Check shrunk capacity.
|
|
CHECK_EQ(32, ObjectHashTable::cast(weakset->table())->Capacity());
|
|
}
|
|
|
|
|
|
// Test that weak set values on an evacuation candidate which are not reachable
|
|
// by other paths are correctly recorded in the slots buffer.
|
|
TEST(WeakSet_Regress2060a) {
|
|
if (i::FLAG_never_compact) return;
|
|
FLAG_always_compact = true;
|
|
LocalContext context;
|
|
Isolate* isolate = GetIsolateFrom(&context);
|
|
Factory* factory = isolate->factory();
|
|
Heap* heap = isolate->heap();
|
|
HandleScope scope(isolate);
|
|
Handle<JSFunction> function = factory->NewFunction(
|
|
factory->function_string());
|
|
Handle<JSObject> key = factory->NewJSObject(function);
|
|
Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
|
|
|
|
// Start second old-space page so that values land on evacuation candidate.
|
|
Page* first_page = heap->old_space()->anchor()->next_page();
|
|
heap::SimulateFullSpace(heap->old_space());
|
|
|
|
// Fill up weak set with values on an evacuation candidate.
|
|
{
|
|
HandleScope scope(isolate);
|
|
for (int i = 0; i < 32; i++) {
|
|
Handle<JSObject> object = factory->NewJSObject(function, TENURED);
|
|
CHECK(!heap->InNewSpace(*object));
|
|
CHECK(!first_page->Contains(object->address()));
|
|
int32_t hash = Object::GetOrCreateHash(isolate, key)->value();
|
|
JSWeakCollection::Set(weakset, key, object, hash);
|
|
}
|
|
}
|
|
|
|
// Force compacting garbage collection.
|
|
CHECK(FLAG_always_compact);
|
|
CcTest::CollectAllGarbage();
|
|
}
|
|
|
|
|
|
// Test that weak set keys on an evacuation candidate which are reachable by
|
|
// other strong paths are correctly recorded in the slots buffer.
|
|
TEST(WeakSet_Regress2060b) {
|
|
if (i::FLAG_never_compact) return;
|
|
FLAG_always_compact = true;
|
|
#ifdef VERIFY_HEAP
|
|
FLAG_verify_heap = true;
|
|
#endif
|
|
|
|
LocalContext context;
|
|
Isolate* isolate = GetIsolateFrom(&context);
|
|
Factory* factory = isolate->factory();
|
|
Heap* heap = isolate->heap();
|
|
HandleScope scope(isolate);
|
|
Handle<JSFunction> function = factory->NewFunction(
|
|
factory->function_string());
|
|
|
|
// Start second old-space page so that keys land on evacuation candidate.
|
|
Page* first_page = heap->old_space()->anchor()->next_page();
|
|
heap::SimulateFullSpace(heap->old_space());
|
|
|
|
// Fill up weak set with keys on an evacuation candidate.
|
|
Handle<JSObject> keys[32];
|
|
for (int i = 0; i < 32; i++) {
|
|
keys[i] = factory->NewJSObject(function, TENURED);
|
|
CHECK(!heap->InNewSpace(*keys[i]));
|
|
CHECK(!first_page->Contains(keys[i]->address()));
|
|
}
|
|
Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
|
|
for (int i = 0; i < 32; i++) {
|
|
Handle<Smi> smi(Smi::FromInt(i), isolate);
|
|
int32_t hash = Object::GetOrCreateHash(isolate, keys[i])->value();
|
|
JSWeakCollection::Set(weakset, keys[i], smi, hash);
|
|
}
|
|
|
|
// Force compacting garbage collection. The subsequent collections are used
|
|
// to verify that key references were actually updated.
|
|
CHECK(FLAG_always_compact);
|
|
CcTest::CollectAllGarbage();
|
|
CcTest::CollectAllGarbage();
|
|
CcTest::CollectAllGarbage();
|
|
}
|