| Index: src/ic/mips64/ic-mips64.cc
|
| diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
|
| index e73921a317d44688917f90b3d8853efbad7afbf8..377fffe816b642de45846773d82791bdfe85094c 100644
|
| --- a/src/ic/mips64/ic-mips64.cc
|
| +++ b/src/ic/mips64/ic-mips64.cc
|
| @@ -673,20 +673,18 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
|
| __ lb(a4, FieldMemOperand(a4, Map::kInstanceTypeOffset));
|
| __ JumpIfNotUniqueNameInstanceType(a4, &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, a5, a6, a7, t0));
|
| - Handle<TypeFeedbackVector> dummy_vector =
|
| - TypeFeedbackVector::DummyVector(masm->isolate());
|
| - int slot_index = dummy_vector->GetIndex(
|
| - FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
|
| - __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
|
| - __ li(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, a5, a6, a7, t0));
|
| + Handle<TypeFeedbackVector> dummy_vector =
|
| + TypeFeedbackVector::DummyVector(masm->isolate());
|
| + int slot_index = dummy_vector->GetIndex(
|
| + FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
|
| + __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
|
| + __ li(slot, Operand(Smi::FromInt(slot_index)));
|
|
|
| Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
|
| Code::ComputeHandlerFlags(Code::STORE_IC));
|
| @@ -740,23 +738,17 @@ void KeyedStoreIC::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());
|
| }
|
|
|
|
|
| void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) {
|
| StoreIC_PushArgs(masm);
|
|
|
| - int args = FLAG_vector_stores ? 5 : 3;
|
| - __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss, args, 1);
|
| + __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss, 5, 1);
|
| }
|
|
|
|
|
| @@ -782,8 +774,7 @@ void StoreIC::GenerateMiss(MacroAssembler* masm) {
|
| StoreIC_PushArgs(masm);
|
|
|
| // Perform tail call to the entry.
|
| - int args = FLAG_vector_stores ? 5 : 3;
|
| - __ TailCallRuntime(Runtime::kStoreIC_Miss, args, 1);
|
| + __ TailCallRuntime(Runtime::kStoreIC_Miss, 5, 1);
|
| }
|
|
|
|
|
|
|