| Index: src/ic/arm64/ic-arm64.cc
 | 
| diff --git a/src/ic/arm64/ic-arm64.cc b/src/ic/arm64/ic-arm64.cc
 | 
| index 90b89018fee2675b429c76783e171d59e17e5daa..db1e490d9aa1f174ce9fde3c25fdbcbe04718394 100644
 | 
| --- a/src/ic/arm64/ic-arm64.cc
 | 
| +++ b/src/ic/arm64/ic-arm64.cc
 | 
| @@ -470,15 +470,10 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
 | 
|  
 | 
|  
 | 
|  static void StoreIC_PushArgs(MacroAssembler* masm) {
 | 
| -  if (FLAG_vector_stores) {
 | 
| -    __ Push(StoreDescriptor::ReceiverRegister(),
 | 
| -            StoreDescriptor::NameRegister(), StoreDescriptor::ValueRegister(),
 | 
| -            VectorStoreICDescriptor::SlotRegister(),
 | 
| -            VectorStoreICDescriptor::VectorRegister());
 | 
| -  } else {
 | 
| -    __ Push(StoreDescriptor::ReceiverRegister(),
 | 
| -            StoreDescriptor::NameRegister(), StoreDescriptor::ValueRegister());
 | 
| -  }
 | 
| +  __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(),
 | 
| +          StoreDescriptor::ValueRegister(),
 | 
| +          VectorStoreICDescriptor::SlotRegister(),
 | 
| +          VectorStoreICDescriptor::VectorRegister());
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -486,8 +481,7 @@ void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) {
 | 
|    ASM_LOCATION("KeyedStoreIC::GenerateMiss");
 | 
|    StoreIC_PushArgs(masm);
 | 
|  
 | 
| -  int args = FLAG_vector_stores ? 5 : 3;
 | 
| -  __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss, args, 1);
 | 
| +  __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss, 5, 1);
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -690,19 +684,17 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
 | 
|    __ Ldrb(x10, FieldMemOperand(x10, Map::kInstanceTypeOffset));
 | 
|    __ JumpIfNotUniqueNameInstanceType(x10, &slow);
 | 
|  
 | 
| -  if (FLAG_vector_stores) {
 | 
| -    // 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();
 | 
| -    DCHECK(!AreAliased(vector, slot, x5, x6, x7, x8));
 | 
| -    Handle<TypeFeedbackVector> dummy_vector =
 | 
| -        TypeFeedbackVector::DummyVector(masm->isolate());
 | 
| -    int slot_index = dummy_vector->GetIndex(
 | 
| -        FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
 | 
| -    __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
 | 
| -    __ Mov(slot, Operand(Smi::FromInt(slot_index)));
 | 
| -  }
 | 
| +  // 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();
 | 
| +  DCHECK(!AreAliased(vector, slot, x5, x6, x7, x8));
 | 
| +  Handle<TypeFeedbackVector> dummy_vector =
 | 
| +      TypeFeedbackVector::DummyVector(masm->isolate());
 | 
| +  int slot_index = dummy_vector->GetIndex(
 | 
| +      FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
 | 
| +  __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
 | 
| +  __ Mov(slot, Operand(Smi::FromInt(slot_index)));
 | 
|  
 | 
|    Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
 | 
|        Code::ComputeHandlerFlags(Code::STORE_IC));
 | 
| @@ -778,8 +770,7 @@ void StoreIC::GenerateMiss(MacroAssembler* masm) {
 | 
|    StoreIC_PushArgs(masm);
 | 
|  
 | 
|    // Tail call to the entry.
 | 
| -  int args = FLAG_vector_stores ? 5 : 3;
 | 
| -  __ TailCallRuntime(Runtime::kStoreIC_Miss, args, 1);
 | 
| +  __ TailCallRuntime(Runtime::kStoreIC_Miss, 5, 1);
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |