Commit d14decc3 authored by Dominik Inführ's avatar Dominik Inführ Committed by Commit Bot

Remove next field from JSWeakCollection

The GC now stores EphemeronHashTables in a Worklist.

Bug: chromium:844008
Change-Id: I6ad95b3b49484901d75c6fd92b59065c438fcd03
Reviewed-on: https://chromium-review.googlesource.com/1093092
Commit-Queue: Dominik Inführ <dinfuehr@google.com>
Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53620}
parent 16586b52
...@@ -366,8 +366,7 @@ class PrototypeInfo::BodyDescriptor final : public BodyDescriptorBase { ...@@ -366,8 +366,7 @@ class PrototypeInfo::BodyDescriptor final : public BodyDescriptorBase {
class JSWeakCollection::BodyDescriptorImpl final : public BodyDescriptorBase { class JSWeakCollection::BodyDescriptorImpl final : public BodyDescriptorBase {
public: public:
STATIC_ASSERT(kTableOffset + kPointerSize == kNextOffset); STATIC_ASSERT(kTableOffset + kPointerSize == kSize);
STATIC_ASSERT(kNextOffset + kPointerSize == kSize);
static bool IsValidSlot(Map* map, HeapObject* obj, int offset) { static bool IsValidSlot(Map* map, HeapObject* obj, int offset) {
return IsValidSlotImpl(map, obj, offset); return IsValidSlotImpl(map, obj, offset);
......
...@@ -18,7 +18,6 @@ ACCESSORS(JSCollectionIterator, table, Object, kTableOffset) ...@@ -18,7 +18,6 @@ ACCESSORS(JSCollectionIterator, table, Object, kTableOffset)
ACCESSORS(JSCollectionIterator, index, Object, kIndexOffset) ACCESSORS(JSCollectionIterator, index, Object, kIndexOffset)
ACCESSORS(JSWeakCollection, table, Object, kTableOffset) ACCESSORS(JSWeakCollection, table, Object, kTableOffset)
ACCESSORS(JSWeakCollection, next, Object, kNextOffset)
CAST_ACCESSOR(JSSet) CAST_ACCESSOR(JSSet)
CAST_ACCESSOR(JSSetIterator) CAST_ACCESSOR(JSSetIterator)
......
...@@ -95,9 +95,6 @@ class JSWeakCollection : public JSObject { ...@@ -95,9 +95,6 @@ class JSWeakCollection : public JSObject {
// [table]: the backing hash table mapping keys to values. // [table]: the backing hash table mapping keys to values.
DECL_ACCESSORS(table, Object) DECL_ACCESSORS(table, Object)
// [next]: linked list of encountered weak maps during GC.
DECL_ACCESSORS(next, Object)
static void Initialize(Handle<JSWeakCollection> collection, Isolate* isolate); static void Initialize(Handle<JSWeakCollection> collection, Isolate* isolate);
static void Set(Handle<JSWeakCollection> collection, Handle<Object> key, static void Set(Handle<JSWeakCollection> collection, Handle<Object> key,
Handle<Object> value, int32_t hash); Handle<Object> value, int32_t hash);
...@@ -107,8 +104,7 @@ class JSWeakCollection : public JSObject { ...@@ -107,8 +104,7 @@ class JSWeakCollection : public JSObject {
int max_entries); int max_entries);
static const int kTableOffset = JSObject::kHeaderSize; static const int kTableOffset = JSObject::kHeaderSize;
static const int kNextOffset = kTableOffset + kPointerSize; static const int kSize = kTableOffset + kPointerSize;
static const int kSize = kNextOffset + kPointerSize;
// Iterates the function object according to the visiting policy. // Iterates the function object according to the visiting policy.
class BodyDescriptorImpl; class BodyDescriptorImpl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment