Index: src/mips64/lithium-mips64.cc |
diff --git a/src/mips64/lithium-mips64.cc b/src/mips64/lithium-mips64.cc |
index c2192944346ef3240d5a26282bbf9bca87624ed0..a12764b202af432b936726e127ac68fa3a25bd3c 100644 |
--- a/src/mips64/lithium-mips64.cc |
+++ b/src/mips64/lithium-mips64.cc |
@@ -1103,9 +1103,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); |
} |
@@ -2064,7 +2072,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()); |
} |
LLoadGlobalGeneric* result = |
@@ -2123,7 +2131,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()); |
} |
@@ -2191,7 +2199,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()); |
} |