Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 338e39cbe823ddbe4f32556268284ca01c770727..d8ca130da44442a962364e2fac3d80b2a5bf7b56 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -1988,16 +1988,21 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
// Call to a keyed property. |
// For a synthetic property use keyed load IC followed by function call, |
// for a regular property use keyed CallIC. |
- { PreservePositionScope scope(masm()->positions_recorder()); |
- VisitForStackValue(prop->obj()); |
- } |
if (prop->is_synthetic()) { |
- { PreservePositionScope scope(masm()->positions_recorder()); |
- VisitForAccumulatorValue(prop->key()); |
- } |
+ // Do not visit the object and key subexpressions (they are shared |
+ // by all occurrences of the same rewritten parameter). |
+ ASSERT(prop->obj()->AsVariableProxy() != NULL); |
+ ASSERT(prop->obj()->AsVariableProxy()->var()->AsSlot() != NULL); |
+ Slot* slot = prop->obj()->AsVariableProxy()->var()->AsSlot(); |
+ MemOperand operand = EmitSlotSearch(slot, r1); |
+ __ ldr(r1, operand); |
+ |
+ ASSERT(prop->key()->AsLiteral() != NULL); |
+ ASSERT(prop->key()->AsLiteral()->handle()->IsSmi()); |
+ __ mov(r0, Operand(prop->key()->AsLiteral()->handle())); |
+ |
// Record source code position for IC call. |
SetSourcePosition(prop->position()); |
- __ pop(r1); // We do not need to keep the receiver. |
Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize)); |
EmitCallIC(ic, RelocInfo::CODE_TARGET); |
@@ -2006,6 +2011,9 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
__ Push(r0, r1); // Function, receiver. |
EmitCallWithStub(expr); |
} else { |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
+ VisitForStackValue(prop->obj()); |
+ } |
EmitKeyedCallWithIC(expr, prop->key(), RelocInfo::CODE_TARGET); |
} |
} |