Cleanup interface descriptors to reflect that vectors are part of stores.

src/interface-descriptors.h

 // Copyright 2014 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_CALL_INTERFACE_DESCRIPTOR_H_
 #define V8_CALL_INTERFACE_DESCRIPTOR_H_
 
 #include "src/assembler.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 class PlatformInterfaceDescriptor;
 
 #define INTERFACE_DESCRIPTOR_LIST(V)   \
   V(Void)                              \
   V(ContextOnly)                       \
   V(OnStackWith1Args)                  \
   V(OnStackWith2Args)                  \
   V(OnStackWith3Args)                  \
   V(OnStackWith4Args)                  \
   V(OnStackWith5Args)                  \
   V(OnStackWith6Args)                  \
   V(OnStackWith7Args)                  \
   V(Load)                              \
+  V(LoadWithVector)                    \
   V(LoadGlobal)                        \
   V(LoadGlobalWithVector)              \
   V(Store)                             \
+  V(StoreWithVector)                   \
   V(StoreTransition)                   \
   V(VectorStoreTransition)             \
-  V(VectorStoreICTrampoline)           \
-  V(VectorStoreIC)                     \
-  V(LoadWithVector)                    \
   V(VarArgFunction)                    \
   V(FastNewClosure)                    \
   V(FastNewFunctionContext)            \
   V(FastNewObject)                     \
   V(FastNewRestParameter)              \
   V(FastNewSloppyArguments)            \
   V(FastNewStrictArguments)            \
   V(TypeConversion)                    \
   V(Typeof)                            \
   V(FastCloneRegExp)                   \
@@ skipping 149 matching lines @@
     return data()->platform_specific_descriptor();
   }
 
   FunctionType* GetFunctionType() const { return data()->function_type(); }
 
   static const Register ContextRegister();
 
   const char* DebugName(Isolate* isolate) const;
 
   static FunctionType* BuildDefaultFunctionType(Isolate* isolate,
-                                                int paramater_count);
+                                                int parameter_count);
 
  protected:
   const CallInterfaceDescriptorData* data() const { return data_; }
 
   virtual FunctionType* BuildCallInterfaceDescriptorFunctionType(
       Isolate* isolate, int register_param_count) {
     return BuildDefaultFunctionType(isolate, register_param_count);
   }
 
   virtual void InitializePlatformSpecific(CallInterfaceDescriptorData* data) {
@@ skipping 162 matching lines @@
 
   enum ParameterIndices { kSlotIndex };
 
   static const Register SlotRegister() {
     return LoadDescriptor::SlotRegister();
   }
 };
 
 class StoreDescriptor : public CallInterfaceDescriptor {
  public:
-  DECLARE_DESCRIPTOR(StoreDescriptor, CallInterfaceDescriptor)
+  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreDescriptor,
+                                               CallInterfaceDescriptor)
 
-  enum ParameterIndices {
-    kReceiverIndex,
-    kNameIndex,
-    kValueIndex,
-    kParameterCount
-  };
+  enum ParameterIndices { kReceiverIndex, kNameIndex, kValueIndex, kSlotIndex };
+
   static const Register ReceiverRegister();
   static const Register NameRegister();
   static const Register ValueRegister();
+  static const Register SlotRegister();
 };
 
 
 class StoreTransitionDescriptor : public StoreDescriptor {
  public:
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreTransitionDescriptor,
                                                StoreDescriptor)
 
   // Extends StoreDescriptor with Map parameter.
   enum ParameterIndices {
@@ skipping 25 matching lines @@
     kVirtualSlotVectorIndex = 4,
 
     kVectorIndex = 5
   };
 
   static const Register MapRegister();
   static const Register SlotRegister();
   static const Register VectorRegister();
 };
 
-
-class VectorStoreICTrampolineDescriptor : public StoreDescriptor {
+class StoreWithVectorDescriptor : public StoreDescriptor {
  public:
-  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
-      VectorStoreICTrampolineDescriptor, StoreDescriptor)
-
-  enum ParameterIndices { kReceiverIndex, kNameIndex, kValueIndex, kSlotIndex };
-
-  static const Register SlotRegister();
-};
-
-
-class VectorStoreICDescriptor : public VectorStoreICTrampolineDescriptor {
- public:
-  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
-      VectorStoreICDescriptor, VectorStoreICTrampolineDescriptor)
+  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreWithVectorDescriptor,
+                                               StoreDescriptor)
 
   enum ParameterIndices {
     kReceiverIndex,
     kNameIndex,
     kValueIndex,
     kSlotIndex,
     kVectorIndex
   };
 
   static const Register VectorRegister();
@@ skipping 478 matching lines @@
 }  // namespace v8
 
 
 #if V8_TARGET_ARCH_ARM64
 #include "src/arm64/interface-descriptors-arm64.h"
 #elif V8_TARGET_ARCH_ARM
 #include "src/arm/interface-descriptors-arm.h"
 #endif
 
 #endif  // V8_CALL_INTERFACE_DESCRIPTOR_H_