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

src/interface-descriptors.h

Index: src/interface-descriptors.h
diff --git a/src/interface-descriptors.h b/src/interface-descriptors.h
index 3f08354f8ed10060b7d6fe1dcebaa53cbfc5114c..15a9a75a7911422b48d6db7ad700e379d1833e4f 100644
--- a/src/interface-descriptors.h
+++ b/src/interface-descriptors.h
@@ -24,14 +24,13 @@ class PlatformInterfaceDescriptor;
   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)            \
@@ -384,17 +383,15 @@ class LoadGlobalDescriptor : public CallInterfaceDescriptor {
 
 class StoreDescriptor : public CallInterfaceDescriptor {
  public:
-  DECLARE_DESCRIPTOR(StoreDescriptor, CallInterfaceDescriptor)
+  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreDescriptor,
+                                               CallInterfaceDescriptor)
+
+  enum ParameterIndices { kReceiverIndex, kNameIndex, kValueIndex, kSlotIndex };
 
-  enum ParameterIndices {
-    kReceiverIndex,
-    kNameIndex,
-    kValueIndex,
-    kParameterCount
-  };
   static const Register ReceiverRegister();
   static const Register NameRegister();
   static const Register ValueRegister();
+  static const Register SlotRegister();
 };
 
 
@@ -440,22 +437,10 @@ class VectorStoreTransitionDescriptor : public StoreDescriptor {
   static const Register VectorRegister();
 };
 
-
-class VectorStoreICTrampolineDescriptor : 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 {
+class StoreWithVectorDescriptor : public StoreDescriptor {
  public:
-  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
-      VectorStoreICDescriptor, VectorStoreICTrampolineDescriptor)
+  DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreWithVectorDescriptor,
+                                               StoreDescriptor)
 
   enum ParameterIndices {
     kReceiverIndex,