Remove distinction between DisableTurbofan and DisableCrankshaft.

src/ast-numbering.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/v8.h"
 
 #include "src/ast.h"
 #include "src/ast-numbering.h"
 #include "src/compiler.h"
 #include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
 
 
 class AstNumberingVisitor FINAL : public AstVisitor {
  public:
   explicit AstNumberingVisitor(Zone* zone)
       : AstVisitor(),
         next_id_(BailoutId::FirstUsable().ToInt()),
-        dont_crankshaft_reason_(kNoReason),
-        dont_turbofan_reason_(kNoReason) {
+        dont_optimize_reason_(kNoReason) {
     InitializeAstVisitor(zone);
   }
 
   bool Renumber(FunctionLiteral* node);
 
  private:
 // AST node visitor interface.
 #define DEFINE_VISIT(type) virtual void Visit##type(type* node) OVERRIDE;
   AST_NODE_LIST(DEFINE_VISIT)
 #undef DEFINE_VISIT
 
   bool Finish(FunctionLiteral* node);
 
   void VisitStatements(ZoneList<Statement*>* statements) OVERRIDE;
   void VisitDeclarations(ZoneList<Declaration*>* declarations) OVERRIDE;
   void VisitArguments(ZoneList<Expression*>* arguments);
   void VisitObjectLiteralProperty(ObjectLiteralProperty* property);
 
   int ReserveIdRange(int n) {
     int tmp = next_id_;
     next_id_ += n;
     return tmp;
   }
 
   void IncrementNodeCount() { properties_.add_node_count(1); }
-  void DisableCrankshaft(BailoutReason reason) {
-    dont_crankshaft_reason_ = reason;
-    DisableSelfOptimization();
-  }
-  // TODO(turbofan): Remove the dont_turbofan_reason once no nodes are
-  // DisableTurbofan.  That set of nodes must be kept in sync with
-  // Pipeline::GenerateCode.
-  void DisableTurbofan(BailoutReason reason) {
-    dont_crankshaft_reason_ = reason;
-    dont_turbofan_reason_ = reason;
-    DisableSelfOptimization();
-  }
   void DisableSelfOptimization() {
     properties_.flags()->Add(kDontSelfOptimize);
   }
+  void DisableOptimization(BailoutReason reason) {
+    dont_optimize_reason_ = reason;
+    DisableSelfOptimization();
+  }
   void DisableCaching(BailoutReason reason) {
-    dont_crankshaft_reason_ = reason;
+    dont_optimize_reason_ = reason;
     DisableSelfOptimization();
     properties_.flags()->Add(kDontCache);
   }
 
   template <typename Node>
   void ReserveFeedbackSlots(Node* node) {
     FeedbackVectorRequirements reqs =
         node->ComputeFeedbackRequirements(isolate());
     if (reqs.slots() > 0) {
       node->SetFirstFeedbackSlot(FeedbackVectorSlot(properties_.slots()));
       properties_.increase_slots(reqs.slots());
     }
     if (reqs.ic_slots() > 0) {
       int ic_slots = properties_.ic_slots();
       node->SetFirstFeedbackICSlot(FeedbackVectorICSlot(ic_slots));
       properties_.increase_ic_slots(reqs.ic_slots());
       if (FLAG_vector_ics) {
         for (int i = 0; i < reqs.ic_slots(); i++) {
           properties_.SetKind(ic_slots + i, node->FeedbackICSlotKind(i));
         }
       }
     }
   }
 
-  BailoutReason dont_optimize_reason() const {
-    return (dont_turbofan_reason_ != kNoReason) ? dont_turbofan_reason_
-                                                : dont_crankshaft_reason_;
-  }
+  BailoutReason dont_optimize_reason() const { return dont_optimize_reason_; }
 
   int next_id_;
   AstProperties properties_;
-  BailoutReason dont_crankshaft_reason_;
-  BailoutReason dont_turbofan_reason_;
+  BailoutReason dont_optimize_reason_;
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
   DISALLOW_COPY_AND_ASSIGN(AstNumberingVisitor);
 };
 
 
 void AstNumberingVisitor::VisitVariableDeclaration(VariableDeclaration* node) {
   IncrementNodeCount();
   VisitVariableProxy(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitExportDeclaration(ExportDeclaration* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kExportDeclaration);
+  DisableOptimization(kExportDeclaration);
   VisitVariableProxy(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitModuleUrl(ModuleUrl* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kModuleUrl);
+  DisableOptimization(kModuleUrl);
 }
 
 
 void AstNumberingVisitor::VisitEmptyStatement(EmptyStatement* node) {
   IncrementNodeCount();
 }
 
 
 void AstNumberingVisitor::VisitContinueStatement(ContinueStatement* node) {
   IncrementNodeCount();
 }
 
 
 void AstNumberingVisitor::VisitBreakStatement(BreakStatement* node) {
   IncrementNodeCount();
 }
 
 
 void AstNumberingVisitor::VisitDebuggerStatement(DebuggerStatement* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kDebuggerStatement);
+  DisableOptimization(kDebuggerStatement);
   node->set_base_id(ReserveIdRange(DebuggerStatement::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitNativeFunctionLiteral(
     NativeFunctionLiteral* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kNativeFunctionLiteral);
+  DisableOptimization(kNativeFunctionLiteral);
   node->set_base_id(ReserveIdRange(NativeFunctionLiteral::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitLiteral(Literal* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(Literal::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitRegExpLiteral(RegExpLiteral* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(RegExpLiteral::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitVariableProxy(VariableProxy* node) {
   IncrementNodeCount();
   if (node->var()->IsLookupSlot()) {
-    DisableCrankshaft(kReferenceToAVariableWhichRequiresDynamicLookup);
+    DisableOptimization(kReferenceToAVariableWhichRequiresDynamicLookup);
   }
   ReserveFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(VariableProxy::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitThisFunction(ThisFunction* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(ThisFunction::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitSuperReference(SuperReference* node) {
   IncrementNodeCount();
-  DisableTurbofan(kSuperReference);
+  DisableOptimization(kSuperReference);
   ReserveFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(SuperReference::num_ids()));
   Visit(node->this_var());
 }
 
 
 void AstNumberingVisitor::VisitModuleDeclaration(ModuleDeclaration* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kModuleDeclaration);
+  DisableOptimization(kModuleDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitImportDeclaration(ImportDeclaration* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kImportDeclaration);
+  DisableOptimization(kImportDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitModuleVariable(ModuleVariable* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kModuleVariable);
+  DisableOptimization(kModuleVariable);
   Visit(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitModulePath(ModulePath* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kModulePath);
+  DisableOptimization(kModulePath);
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitModuleStatement(ModuleStatement* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kModuleStatement);
+  DisableOptimization(kModuleStatement);
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitExpressionStatement(ExpressionStatement* node) {
   IncrementNodeCount();
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitReturnStatement(ReturnStatement* node) {
   IncrementNodeCount();
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitYield(Yield* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kYield);
+  DisableOptimization(kYield);
   ReserveFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(Yield::num_ids()));
   Visit(node->generator_object());
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitThrow(Throw* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(Throw::num_ids()));
@@ skipping 35 matching lines @@
   DisableCaching(kModuleLiteral);
   VisitBlock(node->body());
 }
 
 
 void AstNumberingVisitor::VisitCallRuntime(CallRuntime* node) {
   IncrementNodeCount();
   ReserveFeedbackSlots(node);
   if (node->is_jsruntime()) {
     // Don't try to optimize JS runtime calls because we bailout on them.
-    DisableCrankshaft(kCallToAJavaScriptRuntimeFunction);
+    DisableOptimization(kCallToAJavaScriptRuntimeFunction);
   }
   node->set_base_id(ReserveIdRange(CallRuntime::num_ids()));
   VisitArguments(node->arguments());
 }
 
 
 void AstNumberingVisitor::VisitWithStatement(WithStatement* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kWithStatement);
+  DisableOptimization(kWithStatement);
   Visit(node->expression());
   Visit(node->statement());
 }
 
 
 void AstNumberingVisitor::VisitDoWhileStatement(DoWhileStatement* node) {
   IncrementNodeCount();
   DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(DoWhileStatement::num_ids()));
   Visit(node->body());
   Visit(node->cond());
 }
 
 
 void AstNumberingVisitor::VisitWhileStatement(WhileStatement* node) {
   IncrementNodeCount();
   DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(WhileStatement::num_ids()));
   Visit(node->cond());
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitTryCatchStatement(TryCatchStatement* node) {
   IncrementNodeCount();
-  DisableTurbofan(kTryCatchStatement);
+  DisableOptimization(kTryCatchStatement);
   Visit(node->try_block());
   Visit(node->catch_block());
 }
 
 
 void AstNumberingVisitor::VisitTryFinallyStatement(TryFinallyStatement* node) {
   IncrementNodeCount();
-  DisableTurbofan(kTryFinallyStatement);
+  DisableOptimization(kTryFinallyStatement);
   Visit(node->try_block());
   Visit(node->finally_block());
 }
 
 
 void AstNumberingVisitor::VisitProperty(Property* node) {
   IncrementNodeCount();
   ReserveFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(Property::num_ids()));
   Visit(node->key());
@@ skipping 32 matching lines @@
   ReserveFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(ForInStatement::num_ids()));
   Visit(node->each());
   Visit(node->enumerable());
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitForOfStatement(ForOfStatement* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kForOfStatement);
+  DisableOptimization(kForOfStatement);
   node->set_base_id(ReserveIdRange(ForOfStatement::num_ids()));
   Visit(node->assign_iterator());
   Visit(node->next_result());
   Visit(node->result_done());
   Visit(node->assign_each());
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitConditional(Conditional* node) {
@@ skipping 41 matching lines @@
   node->set_base_id(ReserveIdRange(ForStatement::num_ids()));
   if (node->init() != NULL) Visit(node->init());
   if (node->cond() != NULL) Visit(node->cond());
   if (node->next() != NULL) Visit(node->next());
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitClassLiteral(ClassLiteral* node) {
   IncrementNodeCount();
-  DisableCrankshaft(kClassLiteral);
+  DisableOptimization(kClassLiteral);
   node->set_base_id(ReserveIdRange(ClassLiteral::num_ids()));
   if (node->extends()) Visit(node->extends());
   if (node->constructor()) Visit(node->constructor());
   if (node->class_variable_proxy()) {
     VisitVariableProxy(node->class_variable_proxy());
   }
   for (int i = 0; i < node->properties()->length(); i++) {
     VisitObjectLiteralProperty(node->properties()->at(i));
   }
 }
 
 
 void AstNumberingVisitor::VisitObjectLiteral(ObjectLiteral* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(ObjectLiteral::num_ids()));
   for (int i = 0; i < node->properties()->length(); i++) {
     VisitObjectLiteralProperty(node->properties()->at(i));
   }
 }
 
 
 void AstNumberingVisitor::VisitObjectLiteralProperty(
     ObjectLiteralProperty* node) {
-  if (node->is_computed_name()) DisableTurbofan(kComputedPropertyName);
+  if (node->is_computed_name()) DisableOptimization(kComputedPropertyName);
   Visit(node->key());
   Visit(node->value());
 }
 
 
 void AstNumberingVisitor::VisitArrayLiteral(ArrayLiteral* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(node->num_ids()));
   for (int i = 0; i < node->values()->length(); i++) {
     Visit(node->values()->at(i));
@@ skipping 55 matching lines @@
   node->set_dont_optimize_reason(dont_optimize_reason());
   return !HasStackOverflow();
 }
 
 
 bool AstNumberingVisitor::Renumber(FunctionLiteral* node) {
   Scope* scope = node->scope();
 
   if (scope->HasIllegalRedeclaration()) {
     scope->VisitIllegalRedeclaration(this);
-    DisableCrankshaft(kFunctionWithIllegalRedeclaration);
+    DisableOptimization(kFunctionWithIllegalRedeclaration);
     return Finish(node);
   }
-  if (scope->calls_eval()) DisableCrankshaft(kFunctionCallsEval);
+  if (scope->calls_eval()) DisableOptimization(kFunctionCallsEval);
   if (scope->arguments() != NULL && !scope->arguments()->IsStackAllocated()) {
-    DisableCrankshaft(kContextAllocatedArguments);
+    DisableOptimization(kContextAllocatedArguments);
   }
 
   VisitDeclarations(scope->declarations());
   if (scope->is_function_scope() && scope->function() != NULL) {
     // Visit the name of the named function expression.
     Visit(scope->function());
   }
   VisitStatements(node->body());
 
   return Finish(node);
 }
 
 
 bool AstNumbering::Renumber(FunctionLiteral* function, Zone* zone) {
   AstNumberingVisitor visitor(zone);
   return visitor.Renumber(function);
 }
 }
 }  // namespace v8::internal