Index: src/ic/mips/ic-mips.cc |
diff --git a/src/ic/mips/ic-mips.cc b/src/ic/mips/ic-mips.cc |
index 60c06a3eb469b04c469f16e6bc548367e5e05ab1..5f2c0aa6f4326ea574f0bfd9998f0d7a5e0169b5 100644 |
--- a/src/ic/mips/ic-mips.cc |
+++ b/src/ic/mips/ic-mips.cc |
@@ -675,19 +675,17 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, |
__ lb(t0, FieldMemOperand(t0, Map::kInstanceTypeOffset)); |
__ JumpIfNotUniqueNameInstanceType(t0, &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, t1, t2, t4, t5)); |
- 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, t1, t2, t4, t5)); |
+ 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)); |
@@ -741,23 +739,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); |
} |
@@ -783,8 +775,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); |
} |