| Index: src/crankshaft/mips/lithium-codegen-mips.cc
|
| diff --git a/src/crankshaft/mips/lithium-codegen-mips.cc b/src/crankshaft/mips/lithium-codegen-mips.cc
|
| index ba7bdf03f466cfd1d51b8a2b36c89512eaeeb59e..64635daccbfd4fd08b50e39dfdf1ad7717b5ea7a 100644
|
| --- a/src/crankshaft/mips/lithium-codegen-mips.cc
|
| +++ b/src/crankshaft/mips/lithium-codegen-mips.cc
|
| @@ -217,7 +217,7 @@ void LCodeGen::DoPrologue(LPrologue* instr) {
|
| // Load parameter from stack.
|
| __ lw(a0, MemOperand(fp, parameter_offset));
|
| // Store it in the context.
|
| - MemOperand target = ContextOperand(cp, var->index());
|
| + MemOperand target = ContextMemOperand(cp, var->index());
|
| __ sw(a0, target);
|
| // Update the write barrier. This clobbers a3 and a0.
|
| if (need_write_barrier) {
|
| @@ -2741,7 +2741,7 @@ void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) {
|
| Register context = ToRegister(instr->context());
|
| Register result = ToRegister(instr->result());
|
|
|
| - __ lw(result, ContextOperand(context, instr->slot_index()));
|
| + __ lw(result, ContextMemOperand(context, instr->slot_index()));
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
|
|
| @@ -2761,7 +2761,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;
|
|
|
| @@ -3241,9 +3241,8 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
|
| __ Branch(&result_in_receiver);
|
| __ bind(&global_object);
|
| __ lw(result, FieldMemOperand(function, JSFunction::kContextOffset));
|
| - __ lw(result,
|
| - ContextOperand(result, Context::GLOBAL_OBJECT_INDEX));
|
| - __ lw(result, FieldMemOperand(result, JSGlobalObject::kGlobalProxyOffset));
|
| + __ lw(result, ContextMemOperand(result, Context::NATIVE_CONTEXT_INDEX));
|
| + __ lw(result, ContextMemOperand(result, Context::GLOBAL_PROXY_INDEX));
|
|
|
| if (result.is(receiver)) {
|
| __ bind(&result_in_receiver);
|
|
|