Revert of Optimize add/set/delete operations for string keys in Maps and Sets...

Revert of Optimize add/set/delete operations for string keys in Maps and Sets (patchset #1 id:1 of https://codereview.chromium.org/777663003/)

Reason for revert:
Deopt fuzzer reports that something's still broken, reverting until
I can create a minimal repro.

Original issue's description:
> Optimize add/set/delete operations for string keys in Maps and Sets
>
> This was previously landed in commit 66e2f60b, but failed the
> collections mjsunit test with --deopt-every-n=1 due to a typo
> in the shrinking code. This patch corrects and simplifies the
> shrinking logic, and the tests now pass.
>
> R=dslomov@chromium.org
>
> Committed: https://chromium.googlesource.com/v8/v8/+/8599f5f047b4400f7f61de9e449b2246c9aad471

TBR=dslomov@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/742353006

Cr-Commit-Position: refs/heads/master@{#25696}

src/collection.js

@@ -56,7 +56,7 @@ function SetAddJS(key) {
   if (key === 0) {
     key = 0;
   }
-  return %_SetAdd(this, key);
+  return %SetAdd(this, key);
 }
 
 
@@ -74,7 +74,7 @@ function SetDeleteJS(key) {
     throw MakeTypeError('incompatible_method_receiver',
                         ['Set.prototype.delete', this]);
   }
-  return %_SetDelete(this, key);
+  return %SetDelete(this, key);
 }
 
 
@@ -209,7 +209,7 @@ function MapSetJS(key, value) {
   if (key === 0) {
     key = 0;
   }
-  return %_MapSet(this, key, value);
+  return %MapSet(this, key, value);
 }
 
 
@@ -227,7 +227,7 @@ function MapDeleteJS(key) {
     throw MakeTypeError('incompatible_method_receiver',
                         ['Map.prototype.delete', this]);
   }
-  return %_MapDelete(this, key);
+  return %MapDelete(this, key);
 }
 
 

src/hydrogen-instructions.h

@@ -6360,13 +6360,6 @@ class HObjectAccess FINAL {
                          Representation::Smi());
   }
 
-  template <typename CollectionType>
-  static HObjectAccess ForOrderedHashTableNumberOfDeletedElements() {
-    return HObjectAccess(kInobject,
-                         CollectionType::kNumberOfDeletedElementsOffset,
-                         Representation::Smi());
-  }
-
   inline bool Equals(HObjectAccess that) const {
     return value_ == that.value_;  // portion and offset must match
   }

src/hydrogen.h

@@ -2417,26 +2417,14 @@ class HOptimizedGraphBuilder : public HGraphBuilder, public AstVisitor {
       ElementsKind fixed_elements_kind,
       HValue* byte_length, HValue* length);
 
-  // TODO(adamk): Move all OrderedHashTable functions to their own class.
-  HValue* BuildOrderedHashTableHashToBucket(HValue* hash, HValue* num_buckets);
-  template <typename CollectionType>
-  HValue* BuildOrderedHashTableHashToEntry(HValue* table, HValue* hash,
-                                           HValue* num_buckets);
-  template <typename CollectionType>
-  HValue* BuildOrderedHashTableEntryToIndex(HValue* entry, HValue* num_buckets);
   template <typename CollectionType>
   HValue* BuildOrderedHashTableFindEntry(HValue* table, HValue* key,
                                          HValue* hash);
-  template <typename CollectionType>
-  HValue* BuildOrderedHashTableAddEntry(HValue* table, HValue* key,
-                                        HValue* hash,
-                                        HIfContinuation* join_continuation);
-  template <typename CollectionType>
-  void BuildJSCollectionDelete(CallRuntime* call,
-                               const Runtime::Function* c_function);
+
   template <typename CollectionType>
   void BuildJSCollectionHas(CallRuntime* call,
                             const Runtime::Function* c_function);
+
   HValue* BuildStringHashLoadIfIsStringAndHashComputed(
       HValue* object, HIfContinuation* continuation);
 

src/objects.h

@@ -3915,14 +3915,10 @@ class OrderedHashTable: public FixedArray {
       kHeaderSize + kNumberOfBucketsIndex * kPointerSize;
   static const int kNumberOfElementsOffset =
       kHeaderSize + kNumberOfElementsIndex * kPointerSize;
-  static const int kNumberOfDeletedElementsOffset =
-      kHeaderSize + kNumberOfDeletedElementsIndex * kPointerSize;
 
   static const int kEntrySize = entrysize + 1;
   static const int kChainOffset = entrysize;
 
-  static const int kLoadFactor = 2;
-
  private:
   static Handle<Derived> Rehash(Handle<Derived> table, int new_capacity);
 
@@ -3967,6 +3963,7 @@ class OrderedHashTable: public FixedArray {
   static const int kNextTableIndex = kNumberOfElementsIndex;
   static const int kRemovedHolesIndex = kHashTableStartIndex;
 
+  static const int kLoadFactor = 2;
   static const int kMaxCapacity =
       (FixedArray::kMaxLength - kHashTableStartIndex)
       / (1 + (kEntrySize * kLoadFactor));

src/runtime/runtime.h

@@ -301,6 +301,8 @@ namespace internal {
                                                        \
   /* Harmony sets */                                   \
   F(SetInitialize, 1, 1)                               \
+  F(SetAdd, 2, 1)                                      \
+  F(SetDelete, 2, 1)                                   \
   F(SetClear, 1, 1)                                    \
                                                        \
   F(SetIteratorInitialize, 3, 1)                       \
@@ -310,7 +312,9 @@ namespace internal {
                                                        \
   /* Harmony maps */                                   \
   F(MapInitialize, 1, 1)                               \
+  F(MapDelete, 2, 1)                                   \
   F(MapClear, 1, 1)                                    \
+  F(MapSet, 3, 1)                                      \
                                                        \
   F(MapIteratorInitialize, 3, 1)                       \
   F(MapIteratorClone, 1, 1)                            \
@@ -722,13 +726,9 @@ namespace internal {
   F(MathSqrtRT, 1, 1)                     \
   F(MathLogRT, 1, 1)                      \
   /* ES6 Collections */                   \
-  F(MapDelete, 2, 1)                      \
   F(MapGet, 2, 1)                         \
   F(MapGetSize, 1, 1)                     \
   F(MapHas, 2, 1)                         \
-  F(MapSet, 3, 1)                         \
-  F(SetAdd, 2, 1)                         \
-  F(SetDelete, 2, 1)                      \
   F(SetGetSize, 1, 1)                     \
   F(SetHas, 2, 1)                         \
   /* Arrays */                            \