Revert of [stubs] KeyedStoreGeneric: inline dictionary property stores

src/code-stub-assembler.h

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_CODE_STUB_ASSEMBLER_H_
 #define V8_CODE_STUB_ASSEMBLER_H_
 
 #include <functional>
 
 #include "src/compiler/code-assembler.h"
 #include "src/globals.h"
 #include "src/objects.h"
 
 namespace v8 {
 namespace internal {
 
 class CallInterfaceDescriptor;
 class StatsCounter;
 class StubCache;
 
 enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
 
-#define HEAP_CONSTANT_LIST(V)                         \
-  V(AccessorPairMap, AccessorPairMap)                 \
-  V(BooleanMap, BooleanMap)                           \
-  V(CodeMap, CodeMap)                                 \
-  V(empty_string, EmptyString)                        \
-  V(EmptyFixedArray, EmptyFixedArray)                 \
-  V(FalseValue, False)                                \
-  V(FixedArrayMap, FixedArrayMap)                     \
-  V(FixedCOWArrayMap, FixedCOWArrayMap)               \
-  V(FixedDoubleArrayMap, FixedDoubleArrayMap)         \
-  V(FunctionTemplateInfoMap, FunctionTemplateInfoMap) \
-  V(HeapNumberMap, HeapNumberMap)                     \
-  V(MinusZeroValue, MinusZero)                        \
-  V(NanValue, Nan)                                    \
-  V(NullValue, Null)                                  \
-  V(TheHoleValue, TheHole)                            \
-  V(TrueValue, True)                                  \
+#define HEAP_CONSTANT_LIST(V)                 \
+  V(BooleanMap, BooleanMap)                   \
+  V(CodeMap, CodeMap)                         \
+  V(empty_string, EmptyString)                \
+  V(EmptyFixedArray, EmptyFixedArray)         \
+  V(FalseValue, False)                        \
+  V(FixedArrayMap, FixedArrayMap)             \
+  V(FixedCOWArrayMap, FixedCOWArrayMap)       \
+  V(FixedDoubleArrayMap, FixedDoubleArrayMap) \
+  V(HeapNumberMap, HeapNumberMap)             \
+  V(MinusZeroValue, MinusZero)                \
+  V(NanValue, Nan)                            \
+  V(NullValue, Null)                          \
+  V(TheHoleValue, TheHole)                    \
+  V(TrueValue, True)                          \
   V(UndefinedValue, Undefined)
 
 // Provides JavaScript-specific "macro-assembler" functionality on top of the
 // CodeAssembler. By factoring the JavaScript-isms out of the CodeAssembler,
 // it's possible to add JavaScript-specific useful CodeAssembler "macros"
 // without modifying files in the compiler directory (and requiring a review
 // from a compiler directory OWNER).
 class V8_EXPORT_PRIVATE CodeStubAssembler : public compiler::CodeAssembler {
  public:
   CodeStubAssembler(compiler::CodeAssemblerState* state)
@@ skipping 302 matching lines @@
       compiler::Node* object, compiler::Node* offset, compiler::Node* value,
       MachineRepresentation rep = MachineRepresentation::kTagged);
   // Store the Map of an HeapObject.
   compiler::Node* StoreMapNoWriteBarrier(compiler::Node* object,
                                          compiler::Node* map);
   compiler::Node* StoreObjectFieldRoot(compiler::Node* object, int offset,
                                        Heap::RootListIndex root);
   // Store an array element to a FixedArray.
   compiler::Node* StoreFixedArrayElement(
       compiler::Node* object, int index, compiler::Node* value,
-      WriteBarrierMode barrier_mode = UPDATE_WRITE_BARRIER) {
-    return StoreFixedArrayElement(object, IntPtrConstant(index), value,
-                                  barrier_mode, 0, INTPTR_PARAMETERS);
+      WriteBarrierMode barrier_mode = UPDATE_WRITE_BARRIER,
+      ParameterMode parameter_mode = INTEGER_PARAMETERS) {
+    return StoreFixedArrayElement(object, Int32Constant(index), value,
+                                  barrier_mode, parameter_mode);
   }
 
   compiler::Node* StoreFixedArrayElement(
       compiler::Node* object, compiler::Node* index, compiler::Node* value,
       WriteBarrierMode barrier_mode = UPDATE_WRITE_BARRIER,
-      int additional_offset = 0,
       ParameterMode parameter_mode = INTEGER_PARAMETERS);
 
   compiler::Node* StoreFixedDoubleArrayElement(
       compiler::Node* object, compiler::Node* index, compiler::Node* value,
       ParameterMode parameter_mode = INTEGER_PARAMETERS);
 
   void StoreFieldsNoWriteBarrier(compiler::Node* start_address,
                                  compiler::Node* end_address,
                                  compiler::Node* value);
 
@@ skipping 376 matching lines @@
   // See Dictionary::EntryToIndex().
   template <typename Dictionary>
   compiler::Node* EntryToIndex(compiler::Node* entry, int field_index);
   template <typename Dictionary>
   compiler::Node* EntryToIndex(compiler::Node* entry) {
     return EntryToIndex<Dictionary>(entry, Dictionary::kEntryKeyIndex);
   }
   // Calculate a valid size for the a hash table.
   compiler::Node* HashTableComputeCapacity(compiler::Node* at_least_space_for);
 
-  template <class Dictionary>
-  compiler::Node* GetNumberOfElements(compiler::Node* dictionary);
-
-  template <class Dictionary>
-  void SetNumberOfElements(compiler::Node* dictionary,
-                           compiler::Node* num_elements_smi);
-
-  template <class Dictionary>
-  compiler::Node* GetCapacity(compiler::Node* dictionary);
-
-  template <class Dictionary>
-  compiler::Node* GetNextEnumerationIndex(compiler::Node* dictionary);
-
-  template <class Dictionary>
-  void SetNextEnumerationIndex(compiler::Node* dictionary,
-                               compiler::Node* next_enum_index_smi);
-
   // Looks up an entry in a NameDictionaryBase successor. If the entry is found
   // control goes to {if_found} and {var_name_index} contains an index of the
   // key field of the entry found. If the key is not found control goes to
   // {if_not_found}.
   static const int kInlinedDictionaryProbes = 4;
-  enum LookupMode { kFindExisting, kFindInsertionIndex };
   template <typename Dictionary>
   void NameDictionaryLookup(compiler::Node* dictionary,
                             compiler::Node* unique_name, Label* if_found,
                             Variable* var_name_index, Label* if_not_found,
-                            int inlined_probes = kInlinedDictionaryProbes,
-                            LookupMode mode = kFindExisting);
+                            int inlined_probes = kInlinedDictionaryProbes);
 
   compiler::Node* ComputeIntegerHash(compiler::Node* key, compiler::Node* seed);
 
   template <typename Dictionary>
   void NumberDictionaryLookup(compiler::Node* dictionary,
                               compiler::Node* intptr_index, Label* if_found,
                               Variable* var_entry, Label* if_not_found);
 
-  template <class Dictionary>
-  void FindInsertionEntry(compiler::Node* dictionary, compiler::Node* key,
-                          Variable* var_key_index);
-
-  template <class Dictionary>
-  void InsertEntry(compiler::Node* dictionary, compiler::Node* key,
-                   compiler::Node* value, compiler::Node* index,
-                   compiler::Node* enum_index);
-
-  template <class Dictionary>
-  void Add(compiler::Node* dictionary, compiler::Node* key,
-           compiler::Node* value, Label* bailout);
-
   // Tries to check if {object} has own {unique_name} property.
   void TryHasOwnProperty(compiler::Node* object, compiler::Node* map,
                          compiler::Node* instance_type,
                          compiler::Node* unique_name, Label* if_found,
                          Label* if_not_found, Label* if_bailout);
 
   // Tries to get {object}'s own {unique_name} property value. If the property
   // is an accessor then it also calls a getter. If the property is a double
   // field it re-wraps value in an immutable heap number.
   void TryGetOwnProperty(compiler::Node* context, compiler::Node* receiver,
@@ skipping 382 matching lines @@
   }
 #else
 #define CSA_SLOW_ASSERT(csa, x) ((void)0)
 #endif
 
 DEFINE_OPERATORS_FOR_FLAGS(CodeStubAssembler::AllocationFlags);
 
 }  // namespace internal
 }  // namespace v8
 #endif  // V8_CODE_STUB_ASSEMBLER_H_