| Index: src/compiler.cc
|
| ===================================================================
|
| --- src/compiler.cc (revision 5256)
|
| +++ src/compiler.cc (working copy)
|
| @@ -33,7 +33,6 @@
|
| #include "compiler.h"
|
| #include "data-flow.h"
|
| #include "debug.h"
|
| -#include "fast-codegen.h"
|
| #include "flow-graph.h"
|
| #include "full-codegen.h"
|
| #include "liveedit.h"
|
| @@ -120,14 +119,9 @@
|
| //
|
| // --full-compiler enables the dedicated backend for code we expect to be
|
| // run once
|
| - // --fast-compiler enables a speculative optimizing backend (for
|
| - // non-run-once code)
|
| //
|
| // The normal choice of backend can be overridden with the flags
|
| - // --always-full-compiler and --always-fast-compiler, which are mutually
|
| - // incompatible.
|
| - CHECK(!FLAG_always_full_compiler || !FLAG_always_fast_compiler);
|
| -
|
| + // --always-full-compiler.
|
| Handle<SharedFunctionInfo> shared = info->shared_info();
|
| bool is_run_once = (shared.is_null())
|
| ? info->scope()->is_global_scope()
|
| @@ -141,13 +135,6 @@
|
| if (checker.has_supported_syntax()) {
|
| return FullCodeGenerator::MakeCode(info);
|
| }
|
| - } else if (FLAG_always_fast_compiler ||
|
| - (FLAG_fast_compiler && !is_run_once)) {
|
| - FastCodeGenSyntaxChecker checker;
|
| - checker.Check(info);
|
| - if (checker.has_supported_syntax()) {
|
| - return FastCodeGenerator::MakeCode(info);
|
| - }
|
| }
|
|
|
| return CodeGenerator::MakeCode(info);
|
| @@ -528,7 +515,6 @@
|
| // the static helper function MakeCode.
|
| CompilationInfo info(literal, script, false);
|
|
|
| - CHECK(!FLAG_always_full_compiler || !FLAG_always_fast_compiler);
|
| bool is_run_once = literal->try_full_codegen();
|
| bool is_compiled = false;
|
|
|
| @@ -542,16 +528,6 @@
|
| code = FullCodeGenerator::MakeCode(&info);
|
| is_compiled = true;
|
| }
|
| - } else if (FLAG_always_fast_compiler ||
|
| - (FLAG_fast_compiler && !is_run_once)) {
|
| - // Since we are not lazily compiling we do not have a receiver to
|
| - // specialize for.
|
| - FastCodeGenSyntaxChecker checker;
|
| - checker.Check(&info);
|
| - if (checker.has_supported_syntax()) {
|
| - code = FastCodeGenerator::MakeCode(&info);
|
| - is_compiled = true;
|
| - }
|
| }
|
|
|
| if (!is_compiled) {
|
|
|