| Index: src/ic/mips/ic-mips.cc
|
| diff --git a/src/ic/mips/ic-mips.cc b/src/ic/mips/ic-mips.cc
|
| index 7dbaad788ae0b1558432c0c13504c27e51eeb528..a888e0b43d3d0561281d69dec233abf310284e04 100644
|
| --- a/src/ic/mips/ic-mips.cc
|
| +++ b/src/ic/mips/ic-mips.cc
|
| @@ -426,9 +426,9 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| DCHECK(!AreAliased(vector, slot, t0, t1, t2, t5));
|
| Handle<TypeFeedbackVector> dummy_vector = Handle<TypeFeedbackVector>::cast(
|
| masm->isolate()->factory()->keyed_load_dummy_vector());
|
| - int int_slot = dummy_vector->GetIndex(FeedbackVectorICSlot(0));
|
| + int slot_index = dummy_vector->GetIndex(FeedbackVectorICSlot(0));
|
| __ LoadRoot(vector, Heap::kKeyedLoadDummyVectorRootIndex);
|
| - __ li(slot, Operand(Smi::FromInt(int_slot)));
|
| + __ li(slot, Operand(Smi::FromInt(slot_index)));
|
|
|
| Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
|
| Code::ComputeHandlerFlags(Code::LOAD_IC));
|
| @@ -662,6 +662,20 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
|
| __ lw(t0, FieldMemOperand(key, HeapObject::kMapOffset));
|
| __ 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, a3, t0, t1, t2));
|
| + Handle<TypeFeedbackVector> dummy_vector = Handle<TypeFeedbackVector>::cast(
|
| + masm->isolate()->factory()->keyed_store_dummy_vector());
|
| + int slot_index = dummy_vector->GetIndex(FeedbackVectorICSlot(0));
|
| + __ LoadRoot(vector, Heap::kKeyedStoreDummyVectorRootIndex);
|
| + __ li(slot, Operand(Smi::FromInt(slot_index)));
|
| + }
|
| +
|
| Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
|
| Code::ComputeHandlerFlags(Code::STORE_IC));
|
| masm->isolate()->stub_cache()->GenerateProbe(
|
|
|