Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 879c57650b8984773e8b83adbeab7c138e9ec42a..beb3c8f8174c396948220f36f32c1a6a454f371d 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -2995,6 +2995,15 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
ASSERT(ToRegister(instr->result()).is(r0)); |
__ mov(LoadIC::NameRegister(), Operand(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(r0)); |
+ __ mov(LoadIC::SlotRegister(), |
+ Operand(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); |
@@ -3115,6 +3124,15 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
// Name is always in r2. |
__ mov(LoadIC::NameRegister(), Operand(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(r0)); |
+ __ mov(LoadIC::SlotRegister(), |
+ Operand(Smi::FromInt(instr->hydrogen()->slot()))); |
+ } |
Handle<Code> ic = LoadIC::initialize_stub(isolate(), NOT_CONTEXTUAL); |
CallCode(ic, RelocInfo::CODE_TARGET, instr, NEVER_INLINE_TARGET_ADDRESS); |
} |
@@ -3419,6 +3437,16 @@ 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(r0)); |
+ __ mov(LoadIC::SlotRegister(), |
+ Operand(Smi::FromInt(instr->hydrogen()->slot()))); |
+ } |
+ |
Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr, NEVER_INLINE_TARGET_ADDRESS); |
} |