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

Delay processing of declarations for inlining candidates.

Browse Source 
Processing the declarations in an inlining candidate must be performed
after constructing the Hydrogen environment of the candidate function.

R=fschneider@chromium.org
BUG=
TEST=

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8144 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
kmillikin@chromium.org 2011-06-01 13:26:30 +00:00
parent f942c16ee9
commit 27f2f6aa0b
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ast.cc
View File

@ -341,8 +341,7 @@ bool BinaryOperation::ResultOverwriteAllowed() {
// Inlining support
bool Declaration::IsInlineable() const {
UNREACHABLE();
return false;
return proxy()->var()->IsStackAllocated() && fun() == NULL;
}

32
src/hydrogen.cc
View File

@ -4194,14 +4194,6 @@ bool HGraphBuilder::TryInline(Call* expr) {
return false;
}
// Check if we can handle all declarations in the inlined functions.
VisitDeclarations(target_info.scope()->declarations());
if (HasStackOverflow()) {
TraceInline(target, caller, "target has non-trivial declaration");
ClearStackOverflow();
return false;
}
// Don't inline functions that uses the arguments object or that
// have a mismatching number of parameters.
int arity = expr->arguments()->length();
@ -4211,6 +4203,15 @@ bool HGraphBuilder::TryInline(Call* expr) {
return false;
}
// All declarations must be inlineable.
ZoneList<Declaration*>* decls = target_info.scope()->declarations();
int decl_count = decls->length();
for (int i = 0; i < decl_count; ++i) {
if (!decls->at(i)->IsInlineable()) {
TraceInline(target, caller, "target has non-trivial declaration");
return false;
}
}
// All statements in the body must be inlineable.
for (int i = 0, count = function->body()->length(); i < count; ++i) {
if (!function->body()->at(i)->IsInlineable()) {
@ -4236,6 +4237,9 @@ bool HGraphBuilder::TryInline(Call* expr) {
}
// ----------------------------------------------------------------
// After this point, we've made a decision to inline this function (so
// TryInline should always return true).
// Save the pending call context and type feedback oracle. Set up new ones
// for the inlined function.
ASSERT(target_shared->has_deoptimization_support());
@ -4253,12 +4257,12 @@ bool HGraphBuilder::TryInline(Call* expr) {
call_kind);
HBasicBlock* body_entry = CreateBasicBlock(inner_env);
current_block()->Goto(body_entry);
body_entry->SetJoinId(expr->ReturnId());
set_current_block(body_entry);
AddInstruction(new(zone()) HEnterInlined(target,
function,
call_kind));
VisitDeclarations(target_info.scope()->declarations());
VisitStatements(function->body());
if (HasStackOverflow()) {
// Bail out if the inline function did, as we cannot residualize a call
@ -5406,15 +5410,9 @@ void HGraphBuilder::VisitThisFunction(ThisFunction* expr) {
void HGraphBuilder::VisitDeclaration(Declaration* decl) {
// We allow only declarations that do not require code generation.
// The following all require code generation: global variables,
// functions, and variables with slot type LOOKUP
// We support only declarations that do not require code generation.
Variable* var = decl->proxy()->var();
Slot* slot = var->AsSlot();
if (var->is_global() ||
!var->IsStackAllocated() ||
(slot != NULL && slot->type() == Slot::LOOKUP) ||
decl->fun() != NULL) {
if (!var->IsStackAllocated() || decl->fun() != NULL) {
return Bailout("unsupported declaration");
}