Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 407154c3d21ec5adf6093a8bbfe0982d49796775..18b230539b1afc193841f3c9fdb588b77f6d6352 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -2853,6 +2853,14 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
ASSERT(ToRegister(instr->result()).is(rax)); |
__ Move(LoadIC::NameRegister(), instr->name()); |
+ if (FLAG_vector_ics) { |
+ Register vector = ToRegister(instr->temp_vector()); |
+ ASSERT(vector.is(LoadIC::VectorRegister())); |
+ __ Move(vector, instr->hydrogen()->feedback_vector()); |
+ // No need to allocate this register. |
+ ASSERT(LoadIC::SlotRegister().is(rax)); |
+ __ Move(LoadIC::SlotRegister(), Smi::FromInt(instr->hydrogen()->slot())); |
+ } |
ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL; |
Handle<Code> ic = LoadIC::initialize_stub(isolate(), mode); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
@@ -2993,6 +3001,14 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
ASSERT(ToRegister(instr->result()).is(rax)); |
__ Move(LoadIC::NameRegister(), instr->name()); |
+ if (FLAG_vector_ics) { |
+ Register vector = ToRegister(instr->temp_vector()); |
+ ASSERT(vector.is(LoadIC::VectorRegister())); |
+ __ Move(vector, instr->hydrogen()->feedback_vector()); |
+ // No need to allocate this register. |
+ ASSERT(LoadIC::SlotRegister().is(rax)); |
+ __ Move(LoadIC::SlotRegister(), Smi::FromInt(instr->hydrogen()->slot())); |
+ } |
Handle<Code> ic = LoadIC::initialize_stub(isolate(), NOT_CONTEXTUAL); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -3289,6 +3305,15 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
ASSERT(ToRegister(instr->object()).is(LoadIC::ReceiverRegister())); |
ASSERT(ToRegister(instr->key()).is(LoadIC::NameRegister())); |
+ if (FLAG_vector_ics) { |
+ Register vector = ToRegister(instr->temp_vector()); |
+ ASSERT(vector.is(LoadIC::VectorRegister())); |
+ __ Move(vector, instr->hydrogen()->feedback_vector()); |
+ // No need to allocate this register. |
+ ASSERT(LoadIC::SlotRegister().is(rax)); |
+ __ Move(LoadIC::SlotRegister(), Smi::FromInt(instr->hydrogen()->slot())); |
+ } |
+ |
Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |