AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix a latent bug in the top-level compilation of function calls.

Browse Source 
Calls to a non-global variable would go through the "call to a global"
path, rather than the "call to an arbitrary (other) expression" path.

Review URL: http://codereview.chromium.org/355009

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3204 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
kmillikin@chromium.org 2009-11-03 12:47:19 +00:00
parent 1bc9d4857e
commit 85fc0d688a
4 changed files with 65 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/arm/fast-codegen-arm.cc
View File

@ -769,30 +769,40 @@ void FastCodeGenerator::EmitCallWithStub(Call* expr) {
void FastCodeGenerator::VisitCall(Call* expr) { void FastCodeGenerator::VisitCall(Call* expr) {
Comment cmnt(masm_, "[ Call");
Expression* fun = expr->expression(); Expression* fun = expr->expression();
Variable* var = fun->AsVariableProxy()->AsVariable(); Variable* var = fun->AsVariableProxy()->AsVariable();
if (var != NULL && if (var != NULL && var->is_possibly_eval()) {
var->is_possibly_eval()) { // Call to the identifier 'eval'.
// Call to eval. UNREACHABLE();
} else if (var != NULL && !var->is_this() && var->is_global()) {
// Call to a global variable.
__ mov(r1, Operand(var->name()));
// Push global object as receiver for the call IC lookup.
__ ldr(r0, CodeGenerator::GlobalObject());
__ stm(db_w, sp, r1.bit() | r0.bit());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call to a lookup slot.
UNREACHABLE(); UNREACHABLE();
} else if (fun->AsProperty() != NULL) { } else if (fun->AsProperty() != NULL) {
// Call on a property. // Call to an object property.
Property* prop = fun->AsProperty(); Property* prop = fun->AsProperty();
Literal* key = prop->key()->AsLiteral(); Literal* key = prop->key()->AsLiteral();
if (key != NULL && key->handle()->IsSymbol()) { if (key != NULL && key->handle()->IsSymbol()) {
// Call on a named property: foo.x(1,2,3) // Call to a named property, use call IC.
__ mov(r0, Operand(key->handle())); __ mov(r0, Operand(key->handle()));
__ push(r0); __ push(r0);
Visit(prop->obj()); Visit(prop->obj());
// Use call IC.
EmitCallWithIC(expr, RelocInfo::CODE_TARGET); EmitCallWithIC(expr, RelocInfo::CODE_TARGET);
} else { } else {
// Call on a keyed property : foo[key](1,2,3) // Call to a keyed property, use keyed load IC followed by function
// Use a keyed load IC followed by a call IC. // call.
Visit(prop->obj()); Visit(prop->obj());
Visit(prop->key()); Visit(prop->key());
// Record source position of property. // Record source code position for IC call.
SetSourcePosition(prop->position()); SetSourcePosition(prop->position());
Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize)); Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize));
__ Call(ic, RelocInfo::CODE_TARGET); __ Call(ic, RelocInfo::CODE_TARGET);
@ -807,21 +817,8 @@ void FastCodeGenerator::VisitCall(Call* expr) {
__ str(r1, MemOperand(sp)); __ str(r1, MemOperand(sp));
EmitCallWithStub(expr); EmitCallWithStub(expr);
} }
} else if (var != NULL) {
// Call on a global variable
ASSERT(var != NULL && !var->is_this() && var->is_global());
ASSERT(!var->is_possibly_eval());
__ mov(r1, Operand(var->name()));
// Push global object as receiver.
__ ldr(r0, CodeGenerator::GlobalObject());
__ stm(db_w, sp, r1.bit() | r0.bit());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call inside a with-statement
UNREACHABLE();
} else { } else {
// Call with an arbitrary function expression. // Call to some other function expression.
Visit(expr->expression()); Visit(expr->expression());
// Load global receiver object. // Load global receiver object.
__ ldr(r1, CodeGenerator::GlobalObject()); __ ldr(r1, CodeGenerator::GlobalObject());

27
src/compiler.cc
View File

@ -800,18 +800,13 @@ void CodeGenSelector::VisitCall(Call* expr) {
// Check for supported calls // Check for supported calls
if (var != NULL && var->is_possibly_eval()) { if (var != NULL && var->is_possibly_eval()) {
// ---------------------------------- BAILOUT("call to the identifier 'eval'");
// JavaScript example: 'eval(arg)' // eval is not known to be shadowed
// ----------------------------------
BAILOUT("Call to a function named 'eval'");
} else if (var != NULL && !var->is_this() && var->is_global()) { } else if (var != NULL && !var->is_this() && var->is_global()) {
// ---------------------------------- // Calls to global variables are supported.
// JavaScript example: 'foo(1, 2, 3)' // foo is global } else if (var != NULL && var->slot() != NULL &&
// ---------------------------------- var->slot()->type() == Slot::LOOKUP) {
BAILOUT("call to a lookup slot");
} else if (fun->AsProperty() != NULL) { } else if (fun->AsProperty() != NULL) {
// ------------------------------------------------------------------
// JavaScript example: 'object.foo(1, 2, 3)' or 'map["key"](1, 2, 3)'
// ------------------------------------------------------------------
Property* prop = fun->AsProperty(); Property* prop = fun->AsProperty();
Literal* literal_key = prop->key()->AsLiteral(); Literal* literal_key = prop->key()->AsLiteral();
if (literal_key != NULL && literal_key->handle()->IsSymbol()) { if (literal_key != NULL && literal_key->handle()->IsSymbol()) {
@ -823,19 +818,11 @@ void CodeGenSelector::VisitCall(Call* expr) {
ProcessExpression(prop->key(), Expression::kValue); ProcessExpression(prop->key(), Expression::kValue);
CHECK_BAILOUT; CHECK_BAILOUT;
} }
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// ----------------------------------
// JavaScript example: 'with (obj) foo(1, 2, 3)' // foo is in obj
// ----------------------------------
BAILOUT("Call inside a with-statement");
} else { } else {
// ---------------------------------- // Otherwise the call is supported if the function expression is.
// JavaScript example: 'foo(1, 2, 3)' // foo is any expression, not global
// ----------------------------------
ProcessExpression(fun, Expression::kValue); ProcessExpression(fun, Expression::kValue);
} }
// Check all arguments to the call. (Relies on TEMP meaning STACK.) // Check all arguments to the call.
for (int i = 0; i < args->length(); i++) { for (int i = 0; i < args->length(); i++) {
ProcessExpression(args->at(i), Expression::kValue); ProcessExpression(args->at(i), Expression::kValue);
CHECK_BAILOUT; CHECK_BAILOUT;

43
src/ia32/fast-codegen-ia32.cc
View File

@ -787,29 +787,38 @@ void FastCodeGenerator::EmitCallWithStub(Call* expr) {
void FastCodeGenerator::VisitCall(Call* expr) { void FastCodeGenerator::VisitCall(Call* expr) {
Comment cmnt(masm_, "[ Call");
Expression* fun = expr->expression(); Expression* fun = expr->expression();
Variable* var = fun->AsVariableProxy()->AsVariable(); Variable* var = fun->AsVariableProxy()->AsVariable();
if (var != NULL && if (var != NULL && var->is_possibly_eval()) {
var->is_possibly_eval()) { // Call to the identifier 'eval'.
// Call to eval. UNREACHABLE();
} else if (var != NULL && !var->is_this() && var->is_global()) {
// Call to a global variable.
__ push(Immediate(var->name()));
// Push global object as receiver for the call IC lookup.
__ push(CodeGenerator::GlobalObject());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call to a lookup slot.
UNREACHABLE(); UNREACHABLE();
} else if (fun->AsProperty() != NULL) { } else if (fun->AsProperty() != NULL) {
// Call on a property. // Call to an object property.
Property* prop = fun->AsProperty(); Property* prop = fun->AsProperty();
Literal* key = prop->key()->AsLiteral(); Literal* key = prop->key()->AsLiteral();
if (key != NULL && key->handle()->IsSymbol()) { if (key != NULL && key->handle()->IsSymbol()) {
// Call on a named property: foo.x(1,2,3) // Call to a named property, use call IC.
__ push(Immediate(key->handle())); __ push(Immediate(key->handle()));
Visit(prop->obj()); Visit(prop->obj());
// Use call IC.
EmitCallWithIC(expr, RelocInfo::CODE_TARGET); EmitCallWithIC(expr, RelocInfo::CODE_TARGET);
} else { } else {
// Call on a keyed property: foo[key](1,2,3) // Call to a keyed property, use keyed load IC followed by function
// Use a keyed load IC followed by a call IC. // call.
Visit(prop->obj()); Visit(prop->obj());
Visit(prop->key()); Visit(prop->key());
// Record source position of property. // Record source code position for IC call.
SetSourcePosition(prop->position()); SetSourcePosition(prop->position());
Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize)); Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize));
__ call(ic, RelocInfo::CODE_TARGET); __ call(ic, RelocInfo::CODE_TARGET);
@ -830,22 +839,8 @@ void FastCodeGenerator::VisitCall(Call* expr) {
} }
EmitCallWithStub(expr); EmitCallWithStub(expr);
} }
} else if (var != NULL) {
// Call on a global variable
ASSERT(var != NULL);
ASSERT(!var->is_this());
ASSERT(var->is_global());
ASSERT(!var->is_possibly_eval());
__ push(Immediate(var->name()));
// Push global object (receiver).
__ push(CodeGenerator::GlobalObject());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call inside a with-statement
UNREACHABLE();
} else { } else {
// Call with an arbitrary function expression. // Call to some other function expression.
Visit(expr->expression()); Visit(expr->expression());
// Load global receiver object. // Load global receiver object.
__ mov(ebx, CodeGenerator::GlobalObject()); __ mov(ebx, CodeGenerator::GlobalObject());

41
src/x64/fast-codegen-x64.cc
View File

@ -802,29 +802,38 @@ void FastCodeGenerator::EmitCallWithStub(Call* expr) {
void FastCodeGenerator::VisitCall(Call* expr) { void FastCodeGenerator::VisitCall(Call* expr) {
Comment cmnt(masm_, "[ Call");
Expression* fun = expr->expression(); Expression* fun = expr->expression();
Variable* var = fun->AsVariableProxy()->AsVariable(); Variable* var = fun->AsVariableProxy()->AsVariable();
if (var != NULL && if (var != NULL && var->is_possibly_eval()) {
var->is_possibly_eval()) { // Call to the identifier 'eval'.
// Call to eval. UNREACHABLE();
} else if (var != NULL && !var->is_this() && var->is_global()) {
// Call to a global variable.
__ Push(var->name());
// Push global object as receiver for the call IC lookup.
__ push(CodeGenerator::GlobalObject());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call to a lookup slot.
UNREACHABLE(); UNREACHABLE();
} else if (fun->AsProperty() != NULL) { } else if (fun->AsProperty() != NULL) {
// Call on a property. // Call to an object property.
Property* prop = fun->AsProperty(); Property* prop = fun->AsProperty();
Literal* key = prop->key()->AsLiteral(); Literal* key = prop->key()->AsLiteral();
if (key != NULL && key->handle()->IsSymbol()) { if (key != NULL && key->handle()->IsSymbol()) {
// Call on a named property: foo.x(1,2,3) // Call to a named property, use call IC.
__ Push(key->handle()); __ Push(key->handle());
Visit(prop->obj()); Visit(prop->obj());
// Use call IC
EmitCallWithIC(expr, RelocInfo::CODE_TARGET); EmitCallWithIC(expr, RelocInfo::CODE_TARGET);
} else { } else {
// Call on a keyed property: foo[key](1,2,3) // Call to a keyed property, use keyed load IC followed by function
// Use a keyed load IC followed by a call IC. // call.
Visit(prop->obj()); Visit(prop->obj());
Visit(prop->key()); Visit(prop->key());
// Record source position of property. // Record source code position for IC call.
SetSourcePosition(prop->position()); SetSourcePosition(prop->position());
Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize)); Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize));
__ call(ic, RelocInfo::CODE_TARGET); __ call(ic, RelocInfo::CODE_TARGET);
@ -845,20 +854,8 @@ void FastCodeGenerator::VisitCall(Call* expr) {
} }
EmitCallWithStub(expr); EmitCallWithStub(expr);
} }
} else if (var != NULL) {
// Call on a global variable
ASSERT(var != NULL && !var->is_this() && var->is_global());
ASSERT(!var->is_possibly_eval());
__ Push(var->name());
// Push global object (receiver).
__ push(CodeGenerator::GlobalObject());
EmitCallWithIC(expr, RelocInfo::CODE_TARGET_CONTEXT);
} else if (var != NULL && var->slot() != NULL &&
var->slot()->type() == Slot::LOOKUP) {
// Call inside a with-statement
UNREACHABLE();
} else { } else {
// Call with an arbitrary function expression. // Call to some other function expression.
Visit(expr->expression()); Visit(expr->expression());
// Load global receiver object. // Load global receiver object.
__ movq(rbx, CodeGenerator::GlobalObject()); __ movq(rbx, CodeGenerator::GlobalObject());