| Index: src/ia32/full-codegen-ia32.cc
|
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
|
| index ac3f815f5bc511e184bc865f9f6368f455eaac84..06ea56b2b7c227c62116620eee292c944608a4d2 100644
|
| --- a/src/ia32/full-codegen-ia32.cc
|
| +++ b/src/ia32/full-codegen-ia32.cc
|
| @@ -131,6 +131,21 @@ void FullCodeGenerator::Generate(CompilationInfo* info) {
|
| }
|
| #endif
|
|
|
| + // Strict mode functions need to replace the receiver with undefined
|
| + // when called as functions (without an explicit receiver
|
| + // object). ecx is zero for method calls and non-zero for function
|
| + // calls.
|
| + if (info->is_strict_mode()) {
|
| + Label ok;
|
| + __ test(ecx, Operand(ecx));
|
| + __ j(zero, &ok, Label::kNear);
|
| + // +1 for return address.
|
| + int receiver_offset = (scope()->num_parameters() + 1) * kPointerSize;
|
| + __ mov(Operand(esp, receiver_offset),
|
| + Immediate(isolate()->factory()->undefined_value()));
|
| + __ bind(&ok);
|
| + }
|
| +
|
| __ push(ebp); // Caller's frame pointer.
|
| __ mov(ebp, esp);
|
| __ push(esi); // Callee's context.
|
| @@ -2029,8 +2044,8 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr,
|
| // Record source position of the IC call.
|
| SetSourcePosition(expr->position());
|
| InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP;
|
| - Handle<Code> ic = isolate()->stub_cache()->ComputeCallInitialize(
|
| - arg_count, in_loop);
|
| + Handle<Code> ic =
|
| + isolate()->stub_cache()->ComputeCallInitialize(arg_count, in_loop, mode);
|
| EmitCallIC(ic, mode, expr->id());
|
| RecordJSReturnSite(expr);
|
| // Restore context register.
|
| @@ -2040,8 +2055,7 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr,
|
|
|
|
|
| void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr,
|
| - Expression* key,
|
| - RelocInfo::Mode mode) {
|
| + Expression* key) {
|
| // Load the key.
|
| VisitForAccumulatorValue(key);
|
|
|
| @@ -2065,7 +2079,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr,
|
| Handle<Code> ic = isolate()->stub_cache()->ComputeKeyedCallInitialize(
|
| arg_count, in_loop);
|
| __ mov(ecx, Operand(esp, (arg_count + 1) * kPointerSize)); // Key.
|
| - EmitCallIC(ic, mode, expr->id());
|
| + EmitCallIC(ic, RelocInfo::CODE_TARGET, expr->id());
|
| RecordJSReturnSite(expr);
|
| // Restore context register.
|
| __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
| @@ -2176,7 +2190,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| // Record source position for debugger.
|
| SetSourcePosition(expr->position());
|
| InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP;
|
| - CallFunctionStub stub(arg_count, in_loop, RECEIVER_MIGHT_BE_VALUE);
|
| + CallFunctionStub stub(arg_count, in_loop, RECEIVER_MIGHT_BE_IMPLICIT);
|
| __ CallStub(&stub);
|
| RecordJSReturnSite(expr);
|
| // Restore context register.
|
| @@ -2224,9 +2238,10 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| __ bind(&call);
|
| }
|
|
|
| - // The receiver is either the global receiver or a JSObject found by
|
| - // LoadContextSlot.
|
| - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS);
|
| + // The receiver is either the global receiver or an object found
|
| + // by LoadContextSlot. That object could be the hole if the
|
| + // receiver is implicitly the global object.
|
| + EmitCallWithStub(expr, RECEIVER_MIGHT_BE_IMPLICIT);
|
| } else if (fun->AsProperty() != NULL) {
|
| // Call to an object property.
|
| Property* prop = fun->AsProperty();
|
| @@ -2269,7 +2284,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| { PreservePositionScope scope(masm()->positions_recorder());
|
| VisitForStackValue(prop->obj());
|
| }
|
| - EmitKeyedCallWithIC(expr, prop->key(), RelocInfo::CODE_TARGET);
|
| + EmitKeyedCallWithIC(expr, prop->key());
|
| }
|
| }
|
| } else {
|
| @@ -3615,9 +3630,10 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
|
| // Call the JS runtime function via a call IC.
|
| __ Set(ecx, Immediate(expr->name()));
|
| InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP;
|
| + RelocInfo::Mode mode = RelocInfo::CODE_TARGET;
|
| Handle<Code> ic = isolate()->stub_cache()->ComputeCallInitialize(
|
| - arg_count, in_loop);
|
| - EmitCallIC(ic, RelocInfo::CODE_TARGET, expr->id());
|
| + arg_count, in_loop, mode);
|
| + EmitCallIC(ic, mode, expr->id());
|
| // Restore context register.
|
| __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
| } else {
|
|
|