Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: src/compiler.cc

Issue 366005: Fix a bug where if a non-lazily-compiled function is a candidate for... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler.cc
===================================================================
--- src/compiler.cc (revision 3218)
+++ src/compiler.cc (working copy)
@@ -503,6 +503,7 @@
}
// Generate code and return it.
+ bool is_compiled = false;
if (FLAG_fast_compiler && literal->try_fast_codegen()) {
CodeGenSelector selector;
CodeGenSelector::CodeGenTag code_gen = selector.Select(literal);
@@ -510,9 +511,12 @@
code = FastCodeGenerator::MakeCode(literal,
script,
false); // Not eval.
+ is_compiled = true;
}
- ASSERT(code_gen == CodeGenSelector::NORMAL);
- } else {
+ }
+
+ if (!is_compiled) {
+ // We didn't try the fast compiler, or we failed to select it.
code = CodeGenerator::MakeCode(literal,
script,
false); // Not eval.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698