Work in progress: ES6 Maps and Sets with deterministic iteration support

src/objects.cc

Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index c764b33e6793ee169d0866318e19483a888e4b08..1ffebfcf44f3e0d2cb02d86ca319af6b7e90c55f 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -15894,6 +15894,231 @@ void WeakHashTable::AddEntry(int entry, Object* key, Object* value) {
 }
 
 
+template<int entrysize>
+MaybeObject* OrderedHashTable<entrysize>::Allocate(Heap* heap, int capacity) {
+  // capacity must be a factor of two
+  const int kMinCapacity = 4;
+  capacity = RoundUpToPowerOf2(Max(kMinCapacity, capacity));
+  if (capacity > kMaxCapacity) {
+    v8::internal::Heap::FatalProcessOutOfMemory("invalid table size", true);
+  }
+  int num_buckets = capacity / kLoadFactor;
+  OrderedHashTable* table;
+  { MaybeObject* maybe_obj =
+        heap->AllocateFixedArray(
+            kHashTableStartIndex + num_buckets
+            + (capacity * kEntrySize));
+    if (!maybe_obj->To(&table)) return maybe_obj;
+  }
+  for (int i = 0; i < num_buckets; ++i) {
+    table->set(kHashTableStartIndex + i, Smi::FromInt(kNotFound));
+  }
+  table->SetNumberOfBuckets(num_buckets);
+  table->SetNumberOfElements(0);
+  table->SetNumberOfDeletedElements(0);
+  return table;
+}
+
+
+template<int entrysize>
+MaybeObject* OrderedHashTable<entrysize>::EnsureGrowable() {
+  int nof = NumberOfElements();
+  int nod = NumberOfDeletedElements();
+  int capacity = Capacity();
+  if ((nof + nod) < capacity) return this;
+  // Don't need to grow if we can simply clear out deleted entries instead.
+  // Note that we can't compact in place, though, so we always allocate
+  // a new table.
+  int new_capacity = (nod < (capacity >> 1)) ? capacity << 1 : capacity;
+  OrderedHashTable* new_table;
+  { MaybeObject* maybe_obj = Allocate(GetHeap(), new_capacity);
+    if (!maybe_obj->To(&new_table)) return maybe_obj;
+  }
+  return Rehash(new_table);
+}
+
+
+template<int entrysize>
+MaybeObject* OrderedHashTable<entrysize>::Shrink() {
+  int nof = NumberOfElements();
+  int capacity = Capacity();
+  if (nof > (capacity >> 2)) return this;
+  int new_capacity = capacity / 2;
+  OrderedHashTable* new_table;
+  { MaybeObject* maybe_obj = Allocate(GetHeap(), new_capacity);
+    if (!maybe_obj->To(&new_table)) return maybe_obj;
+  }
+  return Rehash(new_table);
+}
+
+
+template<int entrysize>
+MaybeObject* OrderedHashTable<entrysize>::Rehash(OrderedHashTable* new_table) {
+  int nof = NumberOfElements();
+  int nod = NumberOfDeletedElements();
+  int new_buckets = new_table->NumberOfBuckets();
+  int new_entry = 0;
+  for (int old_entry = 0; old_entry < (nof + nod); ++old_entry) {
+    Object* key = KeyAt(old_entry);
+    if (key->IsTheHole()) continue;
+    Object* hash = key->GetHash();
+    int bucket = Smi::cast(hash)->value() & (new_buckets - 1);
+    Object* chain_entry = new_table->get(kHashTableStartIndex + bucket);
+    new_table->set(kHashTableStartIndex + bucket, Smi::FromInt(new_entry));
+    int new_index = new_table->EntryToIndex(new_entry);
+    int old_index = EntryToIndex(old_entry);
+    for (int i = 0; i < entrysize; ++i) {
+      Object* value = get(old_index + i);
+      new_table->set(new_index + i, value);
+    }
+    new_table->set(new_index + kChainOffset, chain_entry);
+    ++new_entry;
+  }
+  new_table->SetNumberOfElements(nof);
+  return new_table;
+}
+
+
+template<int entrysize>
+int OrderedHashTable<entrysize>::FindEntry(Object* key) {
+  ASSERT(!key->IsTheHole());
+  Object* hash = key->GetHash();
+  if (hash->IsUndefined()) return kNotFound;
+  for (int entry = HashToEntry(Smi::cast(hash)->value());
+       entry != kNotFound;
+       entry = ChainAt(entry)) {
+    Object* candidate = KeyAt(entry);
+    if (candidate->SameValue(key))
+      return entry;
+  }
+  return kNotFound;
+}
+
+
+template<int entrysize>
+int OrderedHashTable<entrysize>::AddEntry(int hash) {
+  int entry = NumberOfElements() + NumberOfDeletedElements();
+  int bucket = HashToBucket(hash);
+  int index = EntryToIndex(entry);
+  Object* chain_entry = get(kHashTableStartIndex + bucket);
+  set(kHashTableStartIndex + bucket, Smi::FromInt(entry));
+  set(index + kChainOffset, chain_entry);
+  SetNumberOfElements(NumberOfElements() + 1);
+  return index;
+}
+
+
+template<int entrysize>
+void OrderedHashTable<entrysize>::RemoveEntry(int entry) {
+  int index = EntryToIndex(entry);
+  for (int i = 0; i < entrysize; ++i) {
+    set_the_hole(index + i);
+  }
+  SetNumberOfElements(NumberOfElements() - 1);
+  SetNumberOfDeletedElements(NumberOfDeletedElements() + 1);
+}
+
+
+template class OrderedHashTable<1>;
+template class OrderedHashTable<2>;
+
+
+bool OrderedHashSet::Contains(Object* key) {
+  return FindEntry(key) != kNotFound;
+}
+
+
+Handle<OrderedHashSet> OrderedHashSet::EnsureGrowable(
+    Handle<OrderedHashSet> table) {
+  Handle<OrderedHashTable<1> > table_base = table;
+  CALL_HEAP_FUNCTION(table_base->GetIsolate(),
+                     table_base->EnsureGrowable(),
+                     OrderedHashSet);
+}
+
+
+Handle<OrderedHashSet> OrderedHashSet::Shrink(Handle<OrderedHashSet> table) {
+  Handle<OrderedHashTable<1> > table_base = table;
+  CALL_HEAP_FUNCTION(table_base->GetIsolate(),
+                     table_base->Shrink(),
+                     OrderedHashSet);
+}
+
+
+Handle<OrderedHashSet> OrderedHashSet::Add(Handle<OrderedHashSet> table,
+                                           Handle<Object> key) {
+  if (table->FindEntry(*key) != kNotFound) return table;
+
+  table = EnsureGrowable(table);
+
+  Handle<Object> hash = GetOrCreateHash(key, table->GetIsolate());
+  int index = table->AddEntry(Smi::cast(*hash)->value());
+  table->set(index, *key);
+  return table;
+}
+
+
+Handle<OrderedHashSet> OrderedHashSet::Remove(Handle<OrderedHashSet> table,
+                                              Handle<Object> key) {
+  int entry = table->FindEntry(*key);
+  if (entry == kNotFound) return table;
+  table->RemoveEntry(entry);
+  // TODO(adamk): Don't shrink if we're being iterated over
+  return Shrink(table);
+}
+
+
+Object* OrderedHashMap::Lookup(Object* key) {
+  int entry = FindEntry(key);
+  if (entry == kNotFound) return GetHeap()->the_hole_value();
+  return ValueAt(entry);
+}
+
+
+Handle<OrderedHashMap> OrderedHashMap::EnsureGrowable(
+    Handle<OrderedHashMap> table) {
+  Handle<OrderedHashTable<2> > table_base = table;
+  CALL_HEAP_FUNCTION(table_base->GetIsolate(),
+                     table_base->EnsureGrowable(),
+                     OrderedHashMap);
+}
+
+
+Handle<OrderedHashMap> OrderedHashMap::Shrink(Handle<OrderedHashMap> table) {
+  Handle<OrderedHashTable<2> > table_base = table;
+  CALL_HEAP_FUNCTION(table_base->GetIsolate(),
+                     table_base->Shrink(),
+                     OrderedHashMap);
+}
+
+
+Handle<OrderedHashMap> OrderedHashMap::Put(Handle<OrderedHashMap> table,
+                                           Handle<Object> key,
+                                           Handle<Object> value) {
+  int entry = table->FindEntry(*key);
+
+  if (value->IsTheHole()) {
+    if (entry == kNotFound) return table;
+    table->RemoveEntry(entry);
+    // TODO(adamk): Only shrink if not iterating
+    return Shrink(table);
+  }
+
+  if (entry != kNotFound) {
+    table->set(table->EntryToIndex(entry) + kValueOffset, *value);
+    return table;
+  }
+
+  table = EnsureGrowable(table);
+
+  Handle<Object> hash = GetOrCreateHash(key, table->GetIsolate());
+  int index = table->AddEntry(Smi::cast(*hash)->value());
+  table->set(index, *key);
+  table->set(index + kValueOffset, *value);
+  return table;
+}
+
+
 DeclaredAccessorDescriptorIterator::DeclaredAccessorDescriptorIterator(
     DeclaredAccessorDescriptor* descriptor)
     : array_(descriptor->serialized_data()->GetDataStartAddress()),