Index: src/compiler.cc |
diff --git a/src/compiler.cc b/src/compiler.cc |
index 92331c6a02d8296ab78b7982651e7a35ae93cd12..179ca47c6c2b9f2ecb202a9b4fd13aba216af3aa 100644 |
--- a/src/compiler.cc |
+++ b/src/compiler.cc |
@@ -647,12 +647,7 @@ static void RecordFunctionCompilation(Logger::LogEventsAndTags tag, |
static bool CompileUnoptimizedCode(CompilationInfo* info) { |
DCHECK(AllowCompilation::IsAllowed(info->isolate())); |
- DCHECK(info->function() != NULL); |
- if (!Rewriter::Rewrite(info)) return false; |
- if (!Scope::Analyze(info)) return false; |
- DCHECK(info->scope() != NULL); |
- |
- if (!FullCodeGenerator::MakeCode(info)) { |
+ if (!Compiler::Analyze(info) || !FullCodeGenerator::MakeCode(info)) { |
wingo
2014/10/28 08:31:02
This part changed since the last patch to signal S
|
Isolate* isolate = info->isolate(); |
if (!isolate->has_pending_exception()) isolate->StackOverflow(); |
return false; |
@@ -673,7 +668,6 @@ MUST_USE_RESULT static MaybeHandle<Code> GetUnoptimizedCodeCommon( |
shared->set_strict_mode(lit->strict_mode()); |
SetExpectedNofPropertiesFromEstimate(shared, lit->expected_property_count()); |
shared->set_bailout_reason(lit->dont_optimize_reason()); |
- shared->set_ast_node_count(lit->ast_node_count()); |
// Compile unoptimized code. |
if (!CompileUnoptimizedCode(info)) return MaybeHandle<Code>(); |
@@ -743,18 +737,33 @@ static void InsertCodeIntoOptimizedCodeMap(CompilationInfo* info) { |
} |
-static bool CompileOptimizedPrologue(CompilationInfo* info) { |
- if (!Parser::Parse(info)) return false; |
+static bool Renumber(CompilationInfo* info) { |
+ if (!AstNumbering::Renumber(info->function(), info->zone())) return false; |
+ if (!info->shared_info().is_null()) { |
+ info->shared_info()->set_ast_node_count(info->function()->ast_node_count()); |
+ } |
+ return true; |
+} |
+ |
+ |
+bool Compiler::Analyze(CompilationInfo* info) { |
+ DCHECK(info->function() != NULL); |
if (!Rewriter::Rewrite(info)) return false; |
if (!Scope::Analyze(info)) return false; |
- if (!AstNumbering::Renumber(info->function(), info->zone())) return false; |
+ if (!Renumber(info)) return false; |
DCHECK(info->scope() != NULL); |
return true; |
} |
+bool Compiler::ParseAndAnalyze(CompilationInfo* info) { |
+ if (!Parser::Parse(info)) return false; |
+ return Compiler::Analyze(info); |
+} |
+ |
+ |
static bool GetOptimizedCodeNow(CompilationInfo* info) { |
- if (!CompileOptimizedPrologue(info)) return false; |
+ if (!Compiler::ParseAndAnalyze(info)) return false; |
TimerEventScope<TimerEventRecompileSynchronous> timer(info->isolate()); |
@@ -796,7 +805,7 @@ static bool GetOptimizedCodeLater(CompilationInfo* info) { |
} |
CompilationHandleScope handle_scope(info); |
- if (!CompileOptimizedPrologue(info)) return false; |
+ if (!Compiler::ParseAndAnalyze(info)) return false; |
info->SaveHandles(); // Copy handles to the compilation handle scope. |
TimerEventScope<TimerEventRecompileSynchronous> timer(info->isolate()); |
@@ -910,6 +919,8 @@ bool Compiler::EnsureCompiled(Handle<JSFunction> function, |
// TODO(turbofan): In the future, unoptimized code with deopt support could |
// be generated lazily once deopt is triggered. |
bool Compiler::EnsureDeoptimizationSupport(CompilationInfo* info) { |
+ DCHECK(info->function() != NULL); |
+ DCHECK(info->scope() != NULL); |
if (!info->shared_info()->has_deoptimization_support()) { |
CompilationInfoWithZone unoptimized(info->shared_info()); |
// Note that we use the same AST that we will use for generating the |
@@ -1304,7 +1315,7 @@ Handle<SharedFunctionInfo> Compiler::BuildFunctionInfo( |
Handle<Code> code = isolate->builtins()->CompileLazy(); |
info.SetCode(code); |
scope_info = Handle<ScopeInfo>(ScopeInfo::Empty(isolate)); |
- } else if (FullCodeGenerator::MakeCode(&info)) { |
+ } else if (Renumber(&info) && FullCodeGenerator::MakeCode(&info)) { |
DCHECK(!info.code().is_null()); |
scope_info = ScopeInfo::Create(info.scope(), info.zone()); |
} else { |