Index: src/ia32/lithium-ia32.cc |
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc |
index 8b20e86c70a60c6f5d73a49991873354d7cfdb34..3be2fc41d0788a2a26e2a24a6e4d519f631b5035 100644 |
--- a/src/ia32/lithium-ia32.cc |
+++ b/src/ia32/lithium-ia32.cc |
@@ -1138,9 +1138,17 @@ LInstruction* LChunkBuilder::DoTailCallThroughMegamorphicCache( |
UseFixed(instr->receiver(), LoadDescriptor::ReceiverRegister()); |
LOperand* name_register = |
UseFixed(instr->name(), LoadDescriptor::NameRegister()); |
+ LOperand* slot = NULL; |
+ LOperand* vector = NULL; |
+ if (FLAG_vector_ics) { |
+ slot = UseFixed(instr->slot(), VectorLoadICDescriptor::SlotRegister()); |
+ vector = |
+ UseFixed(instr->vector(), VectorLoadICDescriptor::VectorRegister()); |
+ } |
+ |
// Not marked as call. It can't deoptimize, and it never returns. |
return new (zone()) LTailCallThroughMegamorphicCache( |
- context, receiver_register, name_register); |
+ context, receiver_register, name_register, slot, vector); |
} |
@@ -2115,7 +2123,7 @@ LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) { |
LOperand* global_object = |
UseFixed(instr->global_object(), LoadDescriptor::ReceiverRegister()); |
LOperand* vector = NULL; |
- if (FLAG_vector_ics) { |
+ if (instr->HasVectorAndSlot()) { |
vector = FixedTemp(VectorLoadICDescriptor::VectorRegister()); |
} |
@@ -2176,7 +2184,7 @@ LInstruction* LChunkBuilder::DoLoadNamedGeneric(HLoadNamedGeneric* instr) { |
LOperand* object = |
UseFixed(instr->object(), LoadDescriptor::ReceiverRegister()); |
LOperand* vector = NULL; |
- if (FLAG_vector_ics) { |
+ if (instr->HasVectorAndSlot()) { |
vector = FixedTemp(VectorLoadICDescriptor::VectorRegister()); |
} |
LLoadNamedGeneric* result = new(zone()) LLoadNamedGeneric( |
@@ -2241,7 +2249,7 @@ LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) { |
UseFixed(instr->object(), LoadDescriptor::ReceiverRegister()); |
LOperand* key = UseFixed(instr->key(), LoadDescriptor::NameRegister()); |
LOperand* vector = NULL; |
- if (FLAG_vector_ics) { |
+ if (instr->HasVectorAndSlot()) { |
vector = FixedTemp(VectorLoadICDescriptor::VectorRegister()); |
} |
LLoadKeyedGeneric* result = |