Index: src/ic/ia32/ic-ia32.cc |
diff --git a/src/ic/ia32/ic-ia32.cc b/src/ic/ia32/ic-ia32.cc |
index c302e85d178eb48cfcbd1089c4a0c140549d738c..c8e72155dd1f5daad2891ed3e3247c6a63e2a3ae 100644 |
--- a/src/ic/ia32/ic-ia32.cc |
+++ b/src/ic/ia32/ic-ia32.cc |
@@ -399,10 +399,27 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) { |
Immediate(isolate->factory()->hash_table_map())); |
__ j(equal, &probe_dictionary); |
+ if (FLAG_vector_ics) { |
+ // When vector ics are in use, 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. |
+ Handle<TypeFeedbackVector> dummy_vector = Handle<TypeFeedbackVector>::cast( |
+ isolate->factory()->keyed_load_dummy_vector()); |
+ int slot = dummy_vector->GetIndex(FeedbackVectorICSlot(0)); |
+ __ push(Immediate(Smi::FromInt(slot))); |
+ __ push(Immediate(dummy_vector)); |
+ } |
+ |
Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( |
Code::ComputeHandlerFlags(Code::LOAD_IC)); |
- masm->isolate()->stub_cache()->GenerateProbe( |
- masm, Code::LOAD_IC, flags, false, receiver, key, ebx, no_reg); |
+ masm->isolate()->stub_cache()->GenerateProbe(masm, Code::KEYED_LOAD_IC, flags, |
+ false, receiver, key, ebx, edi); |
+ |
+ if (FLAG_vector_ics) { |
+ __ pop(VectorLoadICDescriptor::VectorRegister()); |
+ __ pop(VectorLoadICDescriptor::SlotRegister()); |
+ } |
+ |
// Cache miss. |
GenerateMiss(masm); |