[Interpreter]: Move builtin-id from function_data to function_identifier.

src/compiler.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler.h"
 
 #include <algorithm>
 
 #include "src/ast/ast-numbering.h"
 #include "src/ast/prettyprinter.h"
@@ skipping 767 matching lines @@
   DCHECK(AllowCompilation::IsAllowed(info->isolate()));
   if (!Compiler::Analyze(info->parse_info()) ||
       !FullCodeGenerator::MakeCode(info)) {
     Isolate* isolate = info->isolate();
     if (!isolate->has_pending_exception()) isolate->StackOverflow();
     return false;
   }
   return true;
 }
 
+static bool IsGeneratorFunctionOrBuiltin(CompilationInfo* info) {
+  if (info->has_shared_info()) {
+    Handle<SharedFunctionInfo> shared = info->shared_info();
+    if (shared->is_generator()) {
+      return true;
+    } else if (shared->HasBuiltinFunctionId()) {
+      BuiltinFunctionId id = shared->builtin_function_id();
+      return id == kGeneratorObjectNext || id == kGeneratorObjectReturn ||
+             id == kGeneratorObjectThrow;
+    }
+  }
+  return info->has_literal() && IsGeneratorFunction(info->literal()->kind());
+}
 
 static bool UseIgnition(CompilationInfo* info) {
-  // Cannot use Ignition when the {function_data} is already used.
-  if (info->has_shared_info() && info->shared_info()->HasBuiltinFunctionId()) {
+  // TODO(4681): Generators are not yet supported.
+  if (IsGeneratorFunctionOrBuiltin(info)) {

[Michael Starzinger, 2016/03/15 17:39:41]

nit: I am not sure combining these two flags into one function improves
readability. Me personally I would rather have them side-by-side and inlined
into the UseIgnition predicate. Because I can very well imagine a generator
implementation, that no longer requires the magical %_GeneratorNext and friends
but Ignition still not supporting yield statements. Would you be opposed to
flatten the condition out as follows?

  // TODO(4681): Generator functions are not yet supported.	
  if ((info->has_shared_info() && info->shared_info()->is_generator()) ||	
      (info->has_literal() && IsGeneratorFunction(info->literal()->kind()))) {	
    return false;	
  }

  // TODO(4681): Resuming a suspended frame is not supported.
  if (info->has_shared_info() &&
      info()->shared_info()->HasBuiltinFunctionId() &&
      (info()->shared_info()->builtin_function_id() == kGeneratorObjectNext ||
       info()->shared_info()->builtin_function_id() == kGeneratorObjectReturn ||
       info()->shared_info()->builtin_function_id() == kGeneratorObjectThrow)) {
    return false;
  }

IMHO this is way easier to read and to maintain.

[rmcilroy, 2016/03/16 13:24:24]

Sure thing - I was trying to reuse the SharedFunctionInfo, but this works for
me. Done.

     return false;
   }
 
-  // TODO(4681): Generators are not yet supported.
-  if ((info->has_shared_info() && info->shared_info()->is_generator()) ||
-      (info->has_literal() && IsGeneratorFunction(info->literal()->kind()))) {
-    return false;
-  }
-
   // Checks whether top level functions should be passed by the filter.
   if (info->closure().is_null()) {
     Vector<const char> filter = CStrVector(FLAG_ignition_filter);
     return (filter.length() == 0) || (filter.length() == 1 && filter[0] == '*');
   }
 
   // Finally respect the filter.
   return info->closure()->PassesFilter(FLAG_ignition_filter);
 }
 
@@ skipping 1155 matching lines @@
 
 #if DEBUG
 void CompilationInfo::PrintAstForTesting() {
   PrintF("--- Source from AST ---\n%s\n",
          PrettyPrinter(isolate()).PrintProgram(literal()));
 }
 #endif
 
 }  // namespace internal
 }  // namespace v8