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

src/ic/s390/ic-s390.cc

 // Copyright 2015 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.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/ic/ic.h"
 #include "src/codegen.h"
 #include "src/ic/ic-compiler.h"
 #include "src/ic/stub-cache.h"
@@ skipping 421 matching lines @@
 
   __ bind(&index_name);
   __ IndexFromHash(r5, key);
   // Now jump to the place where smi keys are handled.
   __ b(&index_smi);
 }
 
 static void StoreIC_PushArgs(MacroAssembler* masm) {
   __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(),
           StoreDescriptor::ValueRegister(),
-          VectorStoreICDescriptor::SlotRegister(),
-          VectorStoreICDescriptor::VectorRegister());
+          StoreWithVectorDescriptor::SlotRegister(),
+          StoreWithVectorDescriptor::VectorRegister());
 }
 
 void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) {
   StoreIC_PushArgs(masm);
 
   __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss);
 }
 
 static void KeyedStoreGenerateMegamorphicHelper(
     MacroAssembler* masm, Label* fast_object, Label* fast_double, Label* slow,
@@ skipping 197 matching lines @@
   PropertyICCompiler::GenerateRuntimeSetProperty(masm, language_mode);
   // Never returns to here.
 
   __ bind(&maybe_name_key);
   __ LoadP(r6, FieldMemOperand(key, HeapObject::kMapOffset));
   __ LoadlB(r6, FieldMemOperand(r6, Map::kInstanceTypeOffset));
   __ JumpIfNotUniqueNameInstanceType(r6, &slow);
 
   // The handlers in the stub cache expect a vector and slot. Since we won't
   // change the IC from any downstream misses, a dummy vector can be used.
-  Register vector = VectorStoreICDescriptor::VectorRegister();
-  Register slot = VectorStoreICDescriptor::SlotRegister();
+  Register vector = StoreWithVectorDescriptor::VectorRegister();
+  Register slot = StoreWithVectorDescriptor::SlotRegister();
   DCHECK(!AreAliased(vector, slot, r7, r8, r9, ip));
   Handle<TypeFeedbackVector> dummy_vector =
       TypeFeedbackVector::DummyVector(masm->isolate());
   int slot_index = dummy_vector->GetIndex(
       FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
   __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
   __ LoadSmiLiteral(slot, Smi::FromInt(slot_index));
 
   masm->isolate()->store_stub_cache()->GenerateProbe(masm, receiver, key, r7,
                                                      r8, r9, ip);
@@ skipping 51 matching lines @@
 
 void StoreIC::GenerateNormal(MacroAssembler* masm) {
   Label miss;
   Register receiver = StoreDescriptor::ReceiverRegister();
   Register name = StoreDescriptor::NameRegister();
   Register value = StoreDescriptor::ValueRegister();
   Register dictionary = r7;
   DCHECK(receiver.is(r3));
   DCHECK(name.is(r4));
   DCHECK(value.is(r2));
-  DCHECK(VectorStoreICDescriptor::VectorRegister().is(r5));
-  DCHECK(VectorStoreICDescriptor::SlotRegister().is(r6));
+  DCHECK(StoreWithVectorDescriptor::VectorRegister().is(r5));
+  DCHECK(StoreWithVectorDescriptor::SlotRegister().is(r6));
 
   __ LoadP(dictionary, FieldMemOperand(receiver, JSObject::kPropertiesOffset));
 
   GenerateDictionaryStore(masm, &miss, dictionary, name, value, r8, r9);
   Counters* counters = masm->isolate()->counters();
   __ IncrementCounter(counters->ic_store_normal_hit(), 1, r8, r9);
   __ Ret();
 
   __ bind(&miss);
   __ IncrementCounter(counters->ic_store_normal_miss(), 1, r8, r9);
@@ skipping 120 matching lines @@
     patcher.masm()->brcl(cc, Operand((branch_instr & 0xffffffff) << 1));
   } else {
     DCHECK(false);
   }
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390