[Interpreter]: Add ignition blacklist to mjsunit.status and test262.status.

src/compiler.cc

Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index d3f063029bdb141b254fc1eebb2907f27e4e995a..3704f9d1f7f13130e086c0f18488b75bdc1be1bd 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -692,24 +692,6 @@ static void RecordFunctionCompilation(Logger::LogEventsAndTags tag,
 }
 
 
-// Checks whether top level functions should be passed by {raw_filter}.
-// TODO(rmcilroy): Remove filtering once ignition can handle test262 harness.
-static bool TopLevelFunctionPassesFilter(const char* raw_filter) {
-  Vector<const char> filter = CStrVector(raw_filter);
-  return (filter.length() == 0) || (filter.length() == 1 && filter[0] == '*');
-}
-
-
-// Checks whether the passed {raw_filter} is a prefix of the given scripts name.
-// TODO(rmcilroy): Remove filtering once ignition can handle test262 harness.
-static bool ScriptPassesFilter(const char* raw_filter, Handle<Script> script) {
-  Vector<const char> filter = CStrVector(raw_filter);
-  if (!script->name()->IsString()) return filter.length() == 0;
-  String* name = String::cast(script->name());
-  return name->IsUtf8EqualTo(filter, true);
-}
-
-
 static bool CompileUnoptimizedCode(CompilationInfo* info) {
   DCHECK(AllowCompilation::IsAllowed(info->isolate()));
   if (!Compiler::Analyze(info->parse_info()) ||
@@ -722,15 +704,42 @@ static bool CompileUnoptimizedCode(CompilationInfo* info) {
 }
 
 
+// Checks whether top level functions should be passed by {raw_filter}.
+static bool TopLevelFunctionPassesFilter(const char* raw_filter) {

[Michael Starzinger, 2015/11/05 18:21:43]

nit: Same comment as below, I assume this is temporary.

[rmcilroy, 2015/11/06 09:51:14]

The one below is temporary, however this one I think is necessary (for at least
as long as filter-ignition is around) since otherwise there is no way to filter
top-level scripts (even although PassesFilter() explicitly mentions top-level
function filtering), thus you can select a single function for running through
ignition without running top-level code (which we do in the cc tests).

[Michael Starzinger, 2015/11/06 10:06:30]

Acknowledged. You are right, makes sense. Can we move it to before the
"CompileUnoptimizedCode" helper then? In the end the two
"CompileUnoptimizedCode" and "GenerateBytecode" should live side by side, so
that the symmetry is obvious.

[rmcilroy, 2015/11/06 10:50:19]

Move above CompileTopLevel since that is where it's used. Does this work for
you?

[Michael Starzinger, 2015/11/06 10:51:42]

Acknowledged. Even better! :)

+  Vector<const char> filter = CStrVector(raw_filter);
+  return (filter.length() == 0) || (filter.length() == 1 && filter[0] == '*');
+}
+
+
+static bool IgnitionShouldFallbackToFullCodeGen(Scope* scope) {

[Michael Starzinger, 2015/11/05 18:21:43]

nit: Can we add a TODO here saying that this is a temporary workaround for now
to get things running. I assume this will disappear once Ignition can handle
"eval" and "catch" properly.

[rmcilroy, 2015/11/06 09:51:14]

Done.

+  if (!FLAG_ignition_fallback_on_eval_and_catch) return false;
+
+  if (scope->is_eval_scope() || scope->is_catch_scope() ||
+      scope->calls_eval()) {
+    return true;
+  }
+  for (auto inner_scope : *scope->inner_scopes()) {
+    if (IgnitionShouldFallbackToFullCodeGen(inner_scope)) return true;
+  }
+  return false;
+}
+
+
 static bool GenerateBytecode(CompilationInfo* info) {
   DCHECK(AllowCompilation::IsAllowed(info->isolate()));
-  if (!Compiler::Analyze(info->parse_info()) ||
-      !interpreter::Interpreter::MakeBytecode(info)) {
+  bool success = false;
+  if (Compiler::Analyze(info->parse_info())) {
+    if (IgnitionShouldFallbackToFullCodeGen(info->scope())) {
+      success = FullCodeGenerator::MakeCode(info);
+    } else {
+      success = interpreter::Interpreter::MakeBytecode(info);
+    }
+  }
+  if (!success) {
     Isolate* isolate = info->isolate();
     if (!isolate->has_pending_exception()) isolate->StackOverflow();
-    return false;
   }
-  return true;
+  return success;
 }
 
 
@@ -748,8 +757,7 @@ MUST_USE_RESULT static MaybeHandle<Code> GetUnoptimizedCodeCommon(
   MaybeDisableOptimization(shared, lit->dont_optimize_reason());
 
   if (FLAG_ignition && !shared->HasBuiltinFunctionId() &&
-      info->closure()->PassesFilter(FLAG_ignition_filter) &&
-      ScriptPassesFilter(FLAG_ignition_script_filter, info->script())) {
+      info->closure()->PassesFilter(FLAG_ignition_filter)) {
     // Compile bytecode for the interpreter.
     if (!GenerateBytecode(info)) return MaybeHandle<Code>();
   } else {
@@ -1237,8 +1245,7 @@ static Handle<SharedFunctionInfo> CompileToplevel(CompilationInfo* info) {
     HistogramTimerScope timer(rate);
 
     // Compile the code.
-    if (FLAG_ignition && TopLevelFunctionPassesFilter(FLAG_ignition_filter) &&
-        ScriptPassesFilter(FLAG_ignition_script_filter, script)) {
+    if (FLAG_ignition && TopLevelFunctionPassesFilter(FLAG_ignition_filter)) {
       if (!GenerateBytecode(info)) {
         return Handle<SharedFunctionInfo>::null();
       }