Chromium Code Reviews| Index: src/ia32/full-codegen-ia32.cc |
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
| index 67b7cbf22705fa670f98311589e93a4258cd3c15..a1db865e19039ff3dd3de7302616904049b5b5e5 100644 |
| --- a/src/ia32/full-codegen-ia32.cc |
| +++ b/src/ia32/full-codegen-ia32.cc |
| @@ -2076,7 +2076,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, |
| } |
| -void FullCodeGenerator::EmitCallWithStub(Call* expr) { |
| +void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { |
| // Code common for calls using the call stub. |
| ZoneList<Expression*>* args = expr->arguments(); |
| int arg_count = args->length(); |
| @@ -2088,7 +2088,7 @@ void FullCodeGenerator::EmitCallWithStub(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, flags); |
| __ CallStub(&stub); |
| RecordJSReturnSite(expr); |
| // Restore context register. |
| @@ -2191,6 +2191,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
| EmitCallWithIC(expr, var->name(), RelocInfo::CODE_TARGET_CONTEXT); |
| } else if (var != NULL && var->AsSlot() != NULL && |
| var->AsSlot()->type() == Slot::LOOKUP) { |
| + __ int3(); |
|
Mads Ager (chromium)
2011/04/28 08:59:01
Whoops. :-)
Kevin Millikin (Chromium)
2011/04/28 09:00:03
Yeah, that's not the intended behavior.
|
| // Call to a lookup slot (dynamically introduced variable). |
| Label slow, done; |
| @@ -2227,7 +2228,9 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
| __ bind(&call); |
| } |
| - EmitCallWithStub(expr); |
| + // The receiver is either the global receiver or a JSObject found by |
| + // LoadContextSlot. |
| + EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); |
| } else if (fun->AsProperty() != NULL) { |
| // Call to an object property. |
| Property* prop = fun->AsProperty(); |
| @@ -2265,7 +2268,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
| // Push Global receiver. |
| __ mov(ecx, GlobalObjectOperand()); |
| __ push(FieldOperand(ecx, GlobalObject::kGlobalReceiverOffset)); |
| - EmitCallWithStub(expr); |
| + EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); |
| } else { |
| { PreservePositionScope scope(masm()->positions_recorder()); |
| VisitForStackValue(prop->obj()); |
| @@ -2281,7 +2284,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
| __ mov(ebx, GlobalObjectOperand()); |
| __ push(FieldOperand(ebx, GlobalObject::kGlobalReceiverOffset)); |
| // Emit function call. |
| - EmitCallWithStub(expr); |
| + EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); |
| } |
| #ifdef DEBUG |