Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index 8f56841a44025289ef42013b9ce04c4512213a62..2647cb3125b350a26c899bbad6bdb16c734b9c5d 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -3370,11 +3370,8 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { |
__ Branch(&result_in_receiver); |
__ bind(&global_object); |
+ CallStubCompiler::FetchGlobalProxy(masm(), receiver, function); |
- __ lw(result, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
- __ lw(result, ContextOperand(result, Context::GLOBAL_OBJECT_INDEX)); |
- __ lw(result, |
- FieldMemOperand(result, JSGlobalObject::kGlobalReceiverOffset)); |
if (result.is(receiver)) { |
__ bind(&result_in_receiver); |
} else { |
@@ -3917,7 +3914,10 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) { |
ASSERT(ToRegister(instr->result()).is(v0)); |
int arity = instr->arity(); |
- CallFunctionStub stub(arity, NO_CALL_FUNCTION_FLAGS); |
+ CallFunctionFlags flags = |
+ instr->hydrogen()->IsContextualCall() ? |
+ RECEIVER_IS_IMPLICIT : NO_CALL_FUNCTION_FLAGS; |
+ CallFunctionStub stub(arity, flags); |
if (instr->hydrogen()->IsTailCall()) { |
if (NeedsEagerFrame()) __ mov(sp, fp); |
__ Jump(stub.GetCode(isolate()), RelocInfo::CODE_TARGET); |