[hash-table] Introduce OrderedHashTableHandler

OrderedHashTableHandler (to be renamed to OrderedHashTable) is the
interface that abstracts away the two different ordered hash tables.

All operations on the two ordered hash tables must be performed
through this new interface so that we can seamlessly migrate from one
table to another behind the scenes.

Bug: v8:6443, v8:7569
Change-Id: Ifc0a38974605b63e0a2a36b4aafb8dc68a081f4a
Reviewed-on: https://chromium-review.googlesource.com/1059865
Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org>
Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53622}

src/objects/ordered-hash-table-inl.h

@@ -24,6 +24,21 @@ inline Object* OrderedHashMap::ValueAt(int entry) {
   return get(EntryToIndex(entry) + kValueOffset);
 }
 
+inline bool OrderedHashSet::Is(Handle<HeapObject> table) {
+  return table->IsOrderedHashSet();
+}
+
+inline bool OrderedHashMap::Is(Handle<HeapObject> table) {
+  return table->IsOrderedHashMap();
+}
+
+inline bool SmallOrderedHashSet::Is(Handle<HeapObject> table) {
+  return table->IsSmallOrderedHashSet();
+}
+
+inline bool SmallOrderedHashMap::Is(Handle<HeapObject> table) {
+  return table->IsSmallOrderedHashMap();
+}
 }  // namespace internal
 }  // namespace v8
 

src/objects/ordered-hash-table.cc

@@ -362,13 +362,17 @@ void SmallOrderedHashTable<Derived>::Initialize(Isolate* isolate,
 #endif  // DEBUG
 }
 
-Handle<SmallOrderedHashSet> SmallOrderedHashSet::Add(
+MaybeHandle<SmallOrderedHashSet> SmallOrderedHashSet::Add(
     Handle<SmallOrderedHashSet> table, Handle<Object> key) {
   Isolate* isolate = table->GetIsolate();
   if (table->HasKey(isolate, key)) return table;
 
   if (table->UsedCapacity() >= table->Capacity()) {
-    table = SmallOrderedHashSet::Grow(table);
+    MaybeHandle<SmallOrderedHashSet> new_table =
+        SmallOrderedHashSet::Grow(table);
+    if (!new_table.ToHandle(&table)) {
+      return MaybeHandle<SmallOrderedHashSet>();
+    }
   }
 
   int hash = key->GetOrCreateHash(table->GetIsolate())->value();
@@ -391,14 +395,18 @@ Handle<SmallOrderedHashSet> SmallOrderedHashSet::Add(
   return table;
 }
 
-Handle<SmallOrderedHashMap> SmallOrderedHashMap::Add(
+MaybeHandle<SmallOrderedHashMap> SmallOrderedHashMap::Add(
     Handle<SmallOrderedHashMap> table, Handle<Object> key,
     Handle<Object> value) {
   Isolate* isolate = table->GetIsolate();
   if (table->HasKey(isolate, key)) return table;
 
   if (table->UsedCapacity() >= table->Capacity()) {
-    table = SmallOrderedHashMap::Grow(table);
+    MaybeHandle<SmallOrderedHashMap> new_table =
+        SmallOrderedHashMap::Grow(table);
+    if (!new_table.ToHandle(&table)) {
+      return MaybeHandle<SmallOrderedHashMap>();
+    }
   }
 
   int hash = key->GetOrCreateHash(table->GetIsolate())->value();
@@ -490,7 +498,8 @@ Handle<Derived> SmallOrderedHashTable<Derived>::Rehash(Handle<Derived> table,
 }
 
 template <class Derived>
-Handle<Derived> SmallOrderedHashTable<Derived>::Grow(Handle<Derived> table) {
+MaybeHandle<Derived> SmallOrderedHashTable<Derived>::Grow(
+    Handle<Derived> table) {
   int capacity = table->Capacity();
   int new_capacity = capacity;
 
@@ -506,7 +515,10 @@ Handle<Derived> SmallOrderedHashTable<Derived>::Grow(Handle<Derived> table) {
       new_capacity = kMaxCapacity;
     }
 
-    // TODO(gsathya): Transition to OrderedHashTable for size > kMaxCapacity.
+    // We need to migrate to a bigger hash table.
+    if (new_capacity > kMaxCapacity) {
+      return MaybeHandle<Derived>();
+    }
   }
 
   return Rehash(table, new_capacity);
@@ -517,7 +529,7 @@ template bool SmallOrderedHashTable<SmallOrderedHashSet>::HasKey(
 template Handle<SmallOrderedHashSet>
 SmallOrderedHashTable<SmallOrderedHashSet>::Rehash(
     Handle<SmallOrderedHashSet> table, int new_capacity);
-template Handle<SmallOrderedHashSet> SmallOrderedHashTable<
+template MaybeHandle<SmallOrderedHashSet> SmallOrderedHashTable<
     SmallOrderedHashSet>::Grow(Handle<SmallOrderedHashSet> table);
 template void SmallOrderedHashTable<SmallOrderedHashSet>::Initialize(
     Isolate* isolate, int capacity);
@@ -527,7 +539,7 @@ template bool SmallOrderedHashTable<SmallOrderedHashMap>::HasKey(
 template Handle<SmallOrderedHashMap>
 SmallOrderedHashTable<SmallOrderedHashMap>::Rehash(
     Handle<SmallOrderedHashMap> table, int new_capacity);
-template Handle<SmallOrderedHashMap> SmallOrderedHashTable<
+template MaybeHandle<SmallOrderedHashMap> SmallOrderedHashTable<
     SmallOrderedHashMap>::Grow(Handle<SmallOrderedHashMap> table);
 template void SmallOrderedHashTable<SmallOrderedHashMap>::Initialize(
     Isolate* isolate, int capacity);
@@ -537,6 +549,133 @@ template bool SmallOrderedHashTable<SmallOrderedHashMap>::Delete(
 template bool SmallOrderedHashTable<SmallOrderedHashSet>::Delete(
     Isolate* isolate, SmallOrderedHashSet* table, Object* key);
 
+template <class SmallTable, class LargeTable>
+Handle<HeapObject> OrderedHashTableHandler<SmallTable, LargeTable>::Allocate(
+    Isolate* isolate, int capacity) {
+  if (capacity < SmallTable::kMaxCapacity) {
+    return SmallTable::Allocate(isolate, capacity);
+  }
+
+  return LargeTable::Allocate(isolate, capacity);
+}
+
+template Handle<HeapObject>
+OrderedHashTableHandler<SmallOrderedHashSet, OrderedHashSet>::Allocate(
+    Isolate* isolate, int capacity);
+template Handle<HeapObject>
+OrderedHashTableHandler<SmallOrderedHashMap, OrderedHashMap>::Allocate(
+    Isolate* isolate, int capacity);
+
+template <class SmallTable, class LargeTable>
+bool OrderedHashTableHandler<SmallTable, LargeTable>::Delete(
+    Handle<HeapObject> table, Handle<Object> key) {
+  if (SmallTable::Is(table)) {
+    return SmallTable::Delete(Handle<SmallTable>::cast(table), key);
+  }
+
+  DCHECK(LargeTable::Is(table));
+  // Note: Once we migrate to the a big hash table, we never migrate
+  // down to a smaller hash table.
+  return LargeTable::Delete(Handle<LargeTable>::cast(table), key);
+}
+
+template <class SmallTable, class LargeTable>
+bool OrderedHashTableHandler<SmallTable, LargeTable>::HasKey(
+    Isolate* isolate, Handle<HeapObject> table, Handle<Object> key) {
+  if (SmallTable::Is(table)) {
+    return Handle<SmallTable>::cast(table)->HasKey(isolate, key);
+  }
+
+  DCHECK(LargeTable::Is(table));
+  return LargeTable::HasKey(isolate, LargeTable::cast(*table), *key);
+}
+
+template bool
+OrderedHashTableHandler<SmallOrderedHashSet, OrderedHashSet>::HasKey(
+    Isolate* isolate, Handle<HeapObject> table, Handle<Object> key);
+template bool
+OrderedHashTableHandler<SmallOrderedHashMap, OrderedHashMap>::HasKey(
+    Isolate* isolate, Handle<HeapObject> table, Handle<Object> key);
+
+Handle<OrderedHashMap> OrderedHashMapHandler::AdjustRepresentation(
+    Isolate* isolate, Handle<SmallOrderedHashMap> table) {
+  Handle<OrderedHashMap> new_table =
+      OrderedHashMap::Allocate(isolate, OrderedHashTableMinSize);
+  int nof = table->NumberOfElements();
+  int nod = table->NumberOfDeletedElements();
+
+  // TODO(gsathya): Optimize the lookup to not re calc offsets. Also,
+  // unhandlify this code as we preallocate the new backing store with
+  // the proper capacity.
+  for (int entry = 0; entry < (nof + nod); ++entry) {
+    Handle<Object> key = handle(table->KeyAt(entry), isolate);
+    if (key->IsTheHole(isolate)) continue;
+    Handle<Object> value = handle(
+        table->GetDataEntry(entry, SmallOrderedHashMap::kValueIndex), isolate);
+    new_table = OrderedHashMap::Add(new_table, key, value);
+  }
+
+  return new_table;
+}
+
+Handle<OrderedHashSet> OrderedHashSetHandler::AdjustRepresentation(
+    Isolate* isolate, Handle<SmallOrderedHashSet> table) {
+  Handle<OrderedHashSet> new_table =
+      OrderedHashSet::Allocate(isolate, OrderedHashTableMinSize);
+  int nof = table->NumberOfElements();
+  int nod = table->NumberOfDeletedElements();
+
+  // TODO(gsathya): Optimize the lookup to not re calc offsets. Also,
+  // unhandlify this code as we preallocate the new backing store with
+  // the proper capacity.
+  for (int entry = 0; entry < (nof + nod); ++entry) {
+    Handle<Object> key = handle(table->KeyAt(entry), isolate);
+    if (key->IsTheHole(isolate)) continue;
+    new_table = OrderedHashSet::Add(new_table, key);
+  }
+
+  return new_table;
+}
+
+Handle<HeapObject> OrderedHashMapHandler::Add(Isolate* isolate,
+                                              Handle<HeapObject> table,
+                                              Handle<Object> key,
+                                              Handle<Object> value) {
+  if (table->IsSmallOrderedHashMap()) {
+    Handle<SmallOrderedHashMap> small_map =
+        Handle<SmallOrderedHashMap>::cast(table);
+    MaybeHandle<SmallOrderedHashMap> new_map =
+        SmallOrderedHashMap::Add(small_map, key, value);
+    if (!new_map.is_null()) return new_map.ToHandleChecked();
+
+    // We couldn't add to the small table, let's migrate to the
+    // big table.
+    table = OrderedHashMapHandler::AdjustRepresentation(isolate, small_map);
+  }
+
+  DCHECK(table->IsOrderedHashMap());
+  return OrderedHashMap::Add(Handle<OrderedHashMap>::cast(table), key, value);
+}
+
+Handle<HeapObject> OrderedHashSetHandler::Add(Isolate* isolate,
+                                              Handle<HeapObject> table,
+                                              Handle<Object> key) {
+  if (table->IsSmallOrderedHashSet()) {
+    Handle<SmallOrderedHashSet> small_set =
+        Handle<SmallOrderedHashSet>::cast(table);
+    MaybeHandle<SmallOrderedHashSet> new_set =
+        SmallOrderedHashSet::Add(small_set, key);
+    if (!new_set.is_null()) return new_set.ToHandleChecked();
+
+    // We couldn't add to the small table, let's migrate to the
+    // big table.
+    table = OrderedHashSetHandler::AdjustRepresentation(isolate, small_set);
+  }
+
+  DCHECK(table->IsOrderedHashSet());
+  return OrderedHashSet::Add(Handle<OrderedHashSet>::cast(table), key);
+}
+
 template <class Derived, class TableType>
 void OrderedHashTableIterator<Derived, TableType>::Transition() {
   DisallowHeapAllocation no_allocation;

src/objects/ordered-hash-table.h

@@ -228,6 +228,7 @@ class OrderedHashSet : public OrderedHashTable<OrderedHashSet, 1> {
                                                GetKeysConversion convert);
   static HeapObject* GetEmpty(Isolate* isolate);
   static inline int GetMapRootIndex();
+  static inline bool Is(Handle<HeapObject> table);
 };
 
 class OrderedHashMap : public OrderedHashTable<OrderedHashMap, 2> {
@@ -244,6 +245,7 @@ class OrderedHashMap : public OrderedHashTable<OrderedHashMap, 2> {
 
   static HeapObject* GetEmpty(Isolate* isolate);
   static inline int GetMapRootIndex();
+  static inline bool Is(Handle<HeapObject> table);
 
   static const int kValueOffset = 1;
 };
@@ -309,8 +311,9 @@ class SmallOrderedHashTable : public HeapObject {
   static bool Delete(Isolate* isolate, Derived* table, Object* key);
 
   // Returns an SmallOrderedHashTable (possibly |table|) with enough
-  // space to add at least one new element.
-  static Handle<Derived> Grow(Handle<Derived> table);
+  // space to add at least one new element. Returns empty handle if
+  // we've already reached MaxCapacity.
+  static MaybeHandle<Derived> Grow(Handle<Derived> table);
 
   static Handle<Derived> Rehash(Handle<Derived> table, int new_capacity);
 
@@ -379,6 +382,13 @@ class SmallOrderedHashTable : public HeapObject {
   // should be stored as another field of this object.
   static const int kLoadFactor = 2;
 
+  // Our growth strategy involves doubling the capacity until we reach
+  // kMaxCapacity, but since the kMaxCapacity is always less than 256,
+  // we will never fully utilize this table. We special case for 256,
+  // by changing the new capacity to be kMaxCapacity in
+  // SmallOrderedHashTable::Grow.
+  static const int kGrowthHack = 256;
+
  protected:
   void SetDataEntry(int entry, int relative_index, Object* value);
 
@@ -490,13 +500,6 @@ class SmallOrderedHashTable : public HeapObject {
     return capacity * Derived::kEntrySize * kPointerSize;
   }
 
-  // Our growth strategy involves doubling the capacity until we reach
-  // kMaxCapacity, but since the kMaxCapacity is always less than 256,
-  // we will never fully utilize this table. We special case for 256,
-  // by changing the new capacity to be kMaxCapacity in
-  // SmallOrderedHashTable::Grow.
-  static const int kGrowthHack = 256;
-
   // This is used for accessing the non |DataTable| part of the
   // structure.
   byte getByte(Offset offset, ByteIndex index) const {
@@ -523,6 +526,10 @@ class SmallOrderedHashTable : public HeapObject {
 
     return used;
   }
+
+ private:
+  friend class OrderedHashMapHandler;
+  friend class OrderedHashSetHandler;
 };
 
 class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
@@ -537,8 +544,9 @@ class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
   // Adds |value| to |table|, if the capacity isn't enough, a new
   // table is created. The original |table| is returned if there is
   // capacity to store |value| otherwise the new table is returned.
-  static Handle<SmallOrderedHashSet> Add(Handle<SmallOrderedHashSet> table,
-                                         Handle<Object> key);
+  static MaybeHandle<SmallOrderedHashSet> Add(Handle<SmallOrderedHashSet> table,
+                                              Handle<Object> key);
+  static inline bool Is(Handle<HeapObject> table);
 };
 
 class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
@@ -554,9 +562,47 @@ class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
   // Adds |value| to |table|, if the capacity isn't enough, a new
   // table is created. The original |table| is returned if there is
   // capacity to store |value| otherwise the new table is returned.
-  static Handle<SmallOrderedHashMap> Add(Handle<SmallOrderedHashMap> table,
-                                         Handle<Object> key,
-                                         Handle<Object> value);
+  static MaybeHandle<SmallOrderedHashMap> Add(Handle<SmallOrderedHashMap> table,
+                                              Handle<Object> key,
+                                              Handle<Object> value);
+  static inline bool Is(Handle<HeapObject> table);
+};
+
+// TODO(gsathya): Rename this to OrderedHashTable, after we rename
+// OrderedHashTable to LargeOrderedHashTable. Also set up a
+// OrderedHashSetBase class as a base class for the two tables and use
+// that instead of a HeapObject here.
+template <class SmallTable, class LargeTable>
+class OrderedHashTableHandler {
+ public:
+  typedef int Entry;
+
+  static Handle<HeapObject> Allocate(Isolate* isolate, int capacity);
+  static bool Delete(Handle<HeapObject> table, Handle<Object> key);
+  static bool HasKey(Isolate* isolate, Handle<HeapObject> table,
+                     Handle<Object> key);
+
+  // TODO(gsathya): Move this to OrderedHashTable
+  static const int OrderedHashTableMinSize =
+      SmallOrderedHashTable<SmallTable>::kGrowthHack << 1;
+};
+
+class OrderedHashMapHandler
+    : public OrderedHashTableHandler<SmallOrderedHashMap, OrderedHashMap> {
+ public:
+  static Handle<HeapObject> Add(Isolate* isolate, Handle<HeapObject> table,
+                                Handle<Object> key, Handle<Object> value);
+  static Handle<OrderedHashMap> AdjustRepresentation(
+      Isolate* isolate, Handle<SmallOrderedHashMap> table);
+};
+
+class OrderedHashSetHandler
+    : public OrderedHashTableHandler<SmallOrderedHashSet, OrderedHashSet> {
+ public:
+  static Handle<HeapObject> Add(Isolate* isolate, Handle<HeapObject> table,
+                                Handle<Object> key);
+  static Handle<OrderedHashSet> AdjustRepresentation(
+      Isolate* isolate, Handle<SmallOrderedHashSet> table);
 };
 
 class JSCollectionIterator : public JSObject {

test/cctest/test-orderedhashtable.cc

@@ -5,6 +5,7 @@
 #include "src/v8.h"
 
 #include "src/objects-inl.h"
+#include "src/objects/ordered-hash-table-inl.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
@@ -40,14 +41,14 @@ TEST(SmallOrderedHashSetInsertion) {
   // Add a new key.
   Handle<Smi> key1(Smi::FromInt(1), isolate);
   CHECK(!set->HasKey(isolate, key1));
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
   CHECK(set->HasKey(isolate, key1));
 
   // Add existing key.
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -55,14 +56,14 @@ TEST(SmallOrderedHashSetInsertion) {
 
   Handle<String> key2 = factory->NewStringFromAsciiChecked("foo");
   CHECK(!set->HasKey(isolate, key2));
-  set = SmallOrderedHashSet::Add(set, key2);
+  set = SmallOrderedHashSet::Add(set, key2).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(2, set->NumberOfElements());
   CHECK(set->HasKey(isolate, key1));
   CHECK(set->HasKey(isolate, key2));
 
-  set = SmallOrderedHashSet::Add(set, key2);
+  set = SmallOrderedHashSet::Add(set, key2).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(2, set->NumberOfElements());
@@ -71,7 +72,7 @@ TEST(SmallOrderedHashSetInsertion) {
 
   Handle<Symbol> key3 = factory->NewSymbol();
   CHECK(!set->HasKey(isolate, key3));
-  set = SmallOrderedHashSet::Add(set, key3);
+  set = SmallOrderedHashSet::Add(set, key3).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(3, set->NumberOfElements());
@@ -79,7 +80,7 @@ TEST(SmallOrderedHashSetInsertion) {
   CHECK(set->HasKey(isolate, key2));
   CHECK(set->HasKey(isolate, key3));
 
-  set = SmallOrderedHashSet::Add(set, key3);
+  set = SmallOrderedHashSet::Add(set, key3).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(3, set->NumberOfElements());
@@ -89,7 +90,7 @@ TEST(SmallOrderedHashSetInsertion) {
 
   Handle<Object> key4 = factory->NewHeapNumber(42.0);
   CHECK(!set->HasKey(isolate, key4));
-  set = SmallOrderedHashSet::Add(set, key4);
+  set = SmallOrderedHashSet::Add(set, key4).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(4, set->NumberOfElements());
@@ -98,7 +99,7 @@ TEST(SmallOrderedHashSetInsertion) {
   CHECK(set->HasKey(isolate, key3));
   CHECK(set->HasKey(isolate, key4));
 
-  set = SmallOrderedHashSet::Add(set, key4);
+  set = SmallOrderedHashSet::Add(set, key4).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(4, set->NumberOfElements());
@@ -123,14 +124,14 @@ TEST(SmallOrderedHashMapInsertion) {
   Handle<Smi> key1(Smi::FromInt(1), isolate);
   Handle<Smi> value1(Smi::FromInt(1), isolate);
   CHECK(!map->HasKey(isolate, key1));
-  map = SmallOrderedHashMap::Add(map, key1, value1);
+  map = SmallOrderedHashMap::Add(map, key1, value1).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
   CHECK(map->HasKey(isolate, key1));
 
   // Add existing key.
-  map = SmallOrderedHashMap::Add(map, key1, value1);
+  map = SmallOrderedHashMap::Add(map, key1, value1).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -139,14 +140,14 @@ TEST(SmallOrderedHashMapInsertion) {
   Handle<String> key2 = factory->NewStringFromAsciiChecked("foo");
   Handle<String> value = factory->NewStringFromAsciiChecked("foo");
   CHECK(!map->HasKey(isolate, key2));
-  map = SmallOrderedHashMap::Add(map, key2, value);
+  map = SmallOrderedHashMap::Add(map, key2, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(2, map->NumberOfElements());
   CHECK(map->HasKey(isolate, key1));
   CHECK(map->HasKey(isolate, key2));
 
-  map = SmallOrderedHashMap::Add(map, key2, value);
+  map = SmallOrderedHashMap::Add(map, key2, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(2, map->NumberOfElements());
@@ -155,7 +156,7 @@ TEST(SmallOrderedHashMapInsertion) {
 
   Handle<Symbol> key3 = factory->NewSymbol();
   CHECK(!map->HasKey(isolate, key3));
-  map = SmallOrderedHashMap::Add(map, key3, value);
+  map = SmallOrderedHashMap::Add(map, key3, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(3, map->NumberOfElements());
@@ -163,7 +164,7 @@ TEST(SmallOrderedHashMapInsertion) {
   CHECK(map->HasKey(isolate, key2));
   CHECK(map->HasKey(isolate, key3));
 
-  map = SmallOrderedHashMap::Add(map, key3, value);
+  map = SmallOrderedHashMap::Add(map, key3, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(3, map->NumberOfElements());
@@ -173,7 +174,7 @@ TEST(SmallOrderedHashMapInsertion) {
 
   Handle<Object> key4 = factory->NewHeapNumber(42.0);
   CHECK(!map->HasKey(isolate, key4));
-  map = SmallOrderedHashMap::Add(map, key4, value);
+  map = SmallOrderedHashMap::Add(map, key4, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(4, map->NumberOfElements());
@@ -182,7 +183,7 @@ TEST(SmallOrderedHashMapInsertion) {
   CHECK(map->HasKey(isolate, key3));
   CHECK(map->HasKey(isolate, key4));
 
-  map = SmallOrderedHashMap::Add(map, key4, value);
+  map = SmallOrderedHashMap::Add(map, key4, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(4, map->NumberOfElements());
@@ -200,7 +201,7 @@ TEST(SmallOrderedHashSetDuplicateHashCode) {
 
   Handle<SmallOrderedHashSet> set = factory->NewSmallOrderedHashSet();
   Handle<JSObject> key1 = factory->NewJSObjectWithNullProto();
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -209,7 +210,7 @@ TEST(SmallOrderedHashSetDuplicateHashCode) {
   Handle<JSObject> key2 = factory->NewJSObjectWithNullProto();
   CopyHashCode(key1, key2);
 
-  set = SmallOrderedHashSet::Add(set, key2);
+  set = SmallOrderedHashSet::Add(set, key2).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(2, set->NumberOfElements());
@@ -226,7 +227,7 @@ TEST(SmallOrderedHashMapDuplicateHashCode) {
   Handle<SmallOrderedHashMap> map = factory->NewSmallOrderedHashMap();
   Handle<JSObject> value = factory->NewJSObjectWithNullProto();
   Handle<JSObject> key1 = factory->NewJSObjectWithNullProto();
-  map = SmallOrderedHashMap::Add(map, key1, value);
+  map = SmallOrderedHashMap::Add(map, key1, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -240,7 +241,7 @@ TEST(SmallOrderedHashMapDuplicateHashCode) {
   Object* hash2 = key2->GetHash();
   CHECK_EQ(hash1, hash2);
 
-  map = SmallOrderedHashMap::Add(map, key2, value);
+  map = SmallOrderedHashMap::Add(map, key2, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(2, map->NumberOfElements());
@@ -262,7 +263,7 @@ TEST(SmallOrderedHashSetGrow) {
   }
 
   for (size_t i = 0; i < 4; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -277,7 +278,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 4; i < 8; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -292,7 +293,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 8; i < 16; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -307,7 +308,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 16; i < 32; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -322,7 +323,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 32; i < 64; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -337,7 +338,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 64; i < 128; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -352,7 +353,7 @@ TEST(SmallOrderedHashSetGrow) {
   Verify(set);
 
   for (size_t i = 128; i < 254; i++) {
-    set = SmallOrderedHashSet::Add(set, keys[i]);
+    set = SmallOrderedHashSet::Add(set, keys[i]).ToHandleChecked();
     Verify(set);
   }
 
@@ -381,7 +382,7 @@ TEST(SmallOrderedHashMapGrow) {
   }
 
   for (size_t i = 0; i < 4; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -396,7 +397,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 4; i < 8; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -411,7 +412,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 8; i < 16; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -426,7 +427,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 16; i < 32; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -441,7 +442,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 32; i < 64; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -456,7 +457,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 64; i < 128; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -471,7 +472,7 @@ TEST(SmallOrderedHashMapGrow) {
   Verify(map);
 
   for (size_t i = 128; i < 254; i++) {
-    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]);
+    map = SmallOrderedHashMap::Add(map, keys[i], keys[i]).ToHandleChecked();
     Verify(map);
   }
 
@@ -742,7 +743,7 @@ TEST(SmallOrderedHashMapDeletion) {
   CHECK_EQ(0, map->NumberOfDeletedElements());
   CHECK(!map->HasKey(isolate, key1));
 
-  map = SmallOrderedHashMap::Add(map, key1, value1);
+  map = SmallOrderedHashMap::Add(map, key1, value1).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -757,7 +758,7 @@ TEST(SmallOrderedHashMapDeletion) {
   CHECK_EQ(1, map->NumberOfDeletedElements());
   CHECK(!map->HasKey(isolate, key1));
 
-  map = SmallOrderedHashMap::Add(map, key1, value1);
+  map = SmallOrderedHashMap::Add(map, key1, value1).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -766,7 +767,7 @@ TEST(SmallOrderedHashMapDeletion) {
 
   Handle<String> key2 = factory->NewStringFromAsciiChecked("foo");
   CHECK(!map->HasKey(isolate, key2));
-  map = SmallOrderedHashMap::Add(map, key2, value);
+  map = SmallOrderedHashMap::Add(map, key2, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(2, map->NumberOfElements());
@@ -775,7 +776,7 @@ TEST(SmallOrderedHashMapDeletion) {
 
   Handle<Symbol> key3 = factory->NewSymbol();
   CHECK(!map->HasKey(isolate, key3));
-  map = SmallOrderedHashMap::Add(map, key3, value);
+  map = SmallOrderedHashMap::Add(map, key3, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(3, map->NumberOfElements());
@@ -823,7 +824,7 @@ TEST(SmallOrderedHashMapDeletion) {
   CHECK(!map->HasKey(isolate, key3));
 
   // Delete non existent key from non empty hash table
-  map = SmallOrderedHashMap::Add(map, key1, value);
+  map = SmallOrderedHashMap::Add(map, key1, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -879,7 +880,7 @@ TEST(SmallOrderedHashMapDuplicateHashCodeDeletion) {
   Handle<SmallOrderedHashMap> map = factory->NewSmallOrderedHashMap();
   Handle<JSObject> key1 = factory->NewJSObjectWithNullProto();
   Handle<JSObject> value = factory->NewJSObjectWithNullProto();
-  map = SmallOrderedHashMap::Add(map, key1, value);
+  map = SmallOrderedHashMap::Add(map, key1, value).ToHandleChecked();
   Verify(map);
   CHECK_EQ(2, map->NumberOfBuckets());
   CHECK_EQ(1, map->NumberOfElements());
@@ -1041,7 +1042,7 @@ TEST(SmallOrderedHashSetDeletion) {
   CHECK_EQ(0, set->NumberOfDeletedElements());
   CHECK(!set->HasKey(isolate, key1));
 
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -1056,7 +1057,7 @@ TEST(SmallOrderedHashSetDeletion) {
   CHECK_EQ(1, set->NumberOfDeletedElements());
   CHECK(!set->HasKey(isolate, key1));
 
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -1065,7 +1066,7 @@ TEST(SmallOrderedHashSetDeletion) {
 
   Handle<String> key2 = factory->NewStringFromAsciiChecked("foo");
   CHECK(!set->HasKey(isolate, key2));
-  set = SmallOrderedHashSet::Add(set, key2);
+  set = SmallOrderedHashSet::Add(set, key2).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(2, set->NumberOfElements());
@@ -1074,7 +1075,7 @@ TEST(SmallOrderedHashSetDeletion) {
 
   Handle<Symbol> key3 = factory->NewSymbol();
   CHECK(!set->HasKey(isolate, key3));
-  set = SmallOrderedHashSet::Add(set, key3);
+  set = SmallOrderedHashSet::Add(set, key3).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(3, set->NumberOfElements());
@@ -1122,7 +1123,7 @@ TEST(SmallOrderedHashSetDeletion) {
   CHECK(!set->HasKey(isolate, key3));
 
   // Delete non existent key from non empty hash table
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -1176,7 +1177,7 @@ TEST(SmallOrderedHashSetDuplicateHashCodeDeletion) {
 
   Handle<SmallOrderedHashSet> set = factory->NewSmallOrderedHashSet();
   Handle<JSObject> key1 = factory->NewJSObjectWithNullProto();
-  set = SmallOrderedHashSet::Add(set, key1);
+  set = SmallOrderedHashSet::Add(set, key1).ToHandleChecked();
   Verify(set);
   CHECK_EQ(2, set->NumberOfBuckets());
   CHECK_EQ(1, set->NumberOfElements());
@@ -1196,6 +1197,73 @@ TEST(SmallOrderedHashSetDuplicateHashCodeDeletion) {
   CHECK(!set->HasKey(isolate, key2));
 }
 
+TEST(OrderedHashSetHandlerInsertion) {
+  LocalContext context;
+  Isolate* isolate = GetIsolateFrom(&context);
+  HandleScope scope(isolate);
+
+  Handle<HeapObject> set = OrderedHashSetHandler::Allocate(isolate, 4);
+  Verify(set);
+
+  // Add a new key.
+  Handle<Smi> key1(Smi::FromInt(1), isolate);
+  CHECK(!OrderedHashSetHandler::HasKey(isolate, set, key1));
+  set = OrderedHashSetHandler::Add(isolate, set, key1);
+  Verify(set);
+  CHECK(OrderedHashSetHandler::HasKey(isolate, set, key1));
+
+  // Add existing key.
+  set = OrderedHashSetHandler::Add(isolate, set, key1);
+  Verify(set);
+  CHECK(OrderedHashSetHandler::HasKey(isolate, set, key1));
+  CHECK(SmallOrderedHashSet::Is(set));
+
+  for (int i = 0; i < 1024; i++) {
+    Handle<Smi> key_i(Smi::FromInt(i), isolate);
+    set = OrderedHashSetHandler::Add(isolate, set, key_i);
+    Verify(set);
+    for (int j = 0; j <= i; j++) {
+      Handle<Smi> key_j(Smi::FromInt(j), isolate);
+      CHECK(OrderedHashSetHandler::HasKey(isolate, set, key_j));
+    }
+  }
+  CHECK(OrderedHashSet::Is(set));
+}
+
+TEST(OrderedHashMapHandlerInsertion) {
+  LocalContext context;
+  Isolate* isolate = GetIsolateFrom(&context);
+  HandleScope scope(isolate);
+
+  Handle<HeapObject> map = OrderedHashMapHandler::Allocate(isolate, 4);
+  Verify(map);
+
+  // Add a new key.
+  Handle<Smi> key1(Smi::FromInt(1), isolate);
+  Handle<Smi> value1(Smi::FromInt(1), isolate);
+  CHECK(!OrderedHashMapHandler::HasKey(isolate, map, key1));
+  map = OrderedHashMapHandler::Add(isolate, map, key1, value1);
+  Verify(map);
+  CHECK(OrderedHashMapHandler::HasKey(isolate, map, key1));
+
+  // Add existing key.
+  map = OrderedHashMapHandler::Add(isolate, map, key1, value1);
+  Verify(map);
+  CHECK(OrderedHashMapHandler::HasKey(isolate, map, key1));
+  CHECK(SmallOrderedHashMap::Is(map));
+  for (int i = 0; i < 1024; i++) {
+    Handle<Smi> key_i(Smi::FromInt(i), isolate);
+    Handle<Smi> value_i(Smi::FromInt(i), isolate);
+    map = OrderedHashMapHandler::Add(isolate, map, key_i, value_i);
+    Verify(map);
+    for (int j = 0; j <= i; j++) {
+      Handle<Smi> key_j(Smi::FromInt(j), isolate);
+      CHECK(OrderedHashMapHandler::HasKey(isolate, map, key_j));
+    }
+  }
+  CHECK(OrderedHashMap::Is(map));
+}
+
 }  // namespace test_orderedhashtable
 }  // namespace internal
 }  // namespace v8