Index: src/crankshaft/arm/lithium-codegen-arm.cc |
diff --git a/src/crankshaft/arm/lithium-codegen-arm.cc b/src/crankshaft/arm/lithium-codegen-arm.cc |
index bb4c933c9f252b4dba898ca019052bda077dcb4c..4059774e3d7cab1852cd49f4736afeff61bdc77e 100644 |
--- a/src/crankshaft/arm/lithium-codegen-arm.cc |
+++ b/src/crankshaft/arm/lithium-codegen-arm.cc |
@@ -197,7 +197,7 @@ void LCodeGen::DoPrologue(LPrologue* instr) { |
// Load parameter from stack. |
__ ldr(r0, MemOperand(fp, parameter_offset)); |
// Store it in the context. |
- MemOperand target = ContextOperand(cp, var->index()); |
+ MemOperand target = ContextMemOperand(cp, var->index()); |
__ str(r0, target); |
// Update the write barrier. This clobbers r3 and r0. |
if (need_write_barrier) { |
@@ -2813,7 +2813,7 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) { |
Register context = ToRegister(instr->context()); |
Register result = ToRegister(instr->result()); |
- __ ldr(result, ContextOperand(context, instr->slot_index())); |
+ __ ldr(result, ContextMemOperand(context, instr->slot_index())); |
if (instr->hydrogen()->RequiresHoleCheck()) { |
__ LoadRoot(ip, Heap::kTheHoleValueRootIndex); |
__ cmp(result, ip); |
@@ -2830,7 +2830,7 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) { |
Register context = ToRegister(instr->context()); |
Register value = ToRegister(instr->value()); |
Register scratch = scratch0(); |
- MemOperand target = ContextOperand(context, instr->slot_index()); |
+ MemOperand target = ContextMemOperand(context, instr->slot_index()); |
Label skip_assignment; |
@@ -3292,9 +3292,8 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { |
__ b(&result_in_receiver); |
__ bind(&global_object); |
__ ldr(result, FieldMemOperand(function, JSFunction::kContextOffset)); |
- __ ldr(result, |
- ContextOperand(result, Context::GLOBAL_OBJECT_INDEX)); |
- __ ldr(result, FieldMemOperand(result, JSGlobalObject::kGlobalProxyOffset)); |
+ __ ldr(result, ContextMemOperand(result, Context::NATIVE_CONTEXT_INDEX)); |
+ __ ldr(result, ContextMemOperand(result, Context::GLOBAL_PROXY_INDEX)); |
if (result.is(receiver)) { |
__ bind(&result_in_receiver); |