Move BailoutReason and flags computation to post-pass

src/ast-numbering.cc

Index: src/ast-numbering.cc
diff --git a/src/ast-numbering.cc b/src/ast-numbering.cc
index 8dfdccb966524f352afc7d3ff1a69754918435bd..a14fd36233d1021fd5cbc6e5f6e6a77d8be3fc71 100644
--- a/src/ast-numbering.cc
+++ b/src/ast-numbering.cc
@@ -16,7 +16,10 @@ namespace internal {
 class AstNumberingVisitor FINAL : public AstVisitor {
  public:
   explicit AstNumberingVisitor(Zone* zone)
-      : AstVisitor(), next_id_(BailoutId::FirstUsable().ToInt()) {
+      : AstVisitor(),
+        next_id_(BailoutId::FirstUsable().ToInt()),
+        dont_crankshaft_reason_(kNoReason),
+        dont_turbofan_reason_(kNoReason) {
     InitializeAstVisitor(zone);
   }
 
@@ -40,9 +43,38 @@ class AstNumberingVisitor FINAL : public AstVisitor {
   }
 
   void IncrementNodeCount() { properties_.add_node_count(1); }
+  void DisableCrankshaft(BailoutReason reason) {
+    dont_crankshaft_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);

[Sven Panne, 2014/10/29 09:12:55]

Can we delegate between all these helpers and rely on inlining for performance?
This would make the implications much clearer. In this case:

   dont_crankshaft_reason_ = reason;
   DisableSelfOptimization();

[wingo, 2014/11/12 08:50:51]

Done.

+  }
+  // TODO(turbofan): Remove the dont_turbofan_reason once no nodes are
+  // DontTurbofanNode.  That set of nodes must be kept in sync with
+  // Pipeline::GenerateCode.
+  void DisableTurbofan(BailoutReason reason) {
+    dont_crankshaft_reason_ = reason;
+    dont_turbofan_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  void DisableSelfOptimization() {
+    properties_.add_node_count(1);

[Sven Panne, 2014/10/29 09:12:55]

Huh? Why do we increment again here (and in DisableCaching)? This looks wrong...

[wingo, 2014/11/12 08:50:51]

Yes, a bug from a previous version of the patch.  Good catch!  I re-ran
MandreelLatency with this patch applied on master and fixing this problem didn't
have any perf impact, which I guess makes sense as the node count is used for
inlining and these cases wouldn't be optimized anyway.

+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  void DisableCaching(BailoutReason reason) {
+    properties_.add_node_count(1);
+    dont_crankshaft_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+    properties_.flags()->Add(kDontCache);
+  }
+
+  BailoutReason dont_optimize_reason() const {
+    return (dont_turbofan_reason_ != kNoReason) ? dont_turbofan_reason_
+                                                : dont_crankshaft_reason_;
+  }
 
   int next_id_;
   AstProperties properties_;
+  BailoutReason dont_crankshaft_reason_;
+  BailoutReason dont_turbofan_reason_;
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
   DISALLOW_COPY_AND_ASSIGN(AstNumberingVisitor);
@@ -57,12 +89,14 @@ void AstNumberingVisitor::VisitVariableDeclaration(VariableDeclaration* node) {
 
 void AstNumberingVisitor::VisitExportDeclaration(ExportDeclaration* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kExportDeclaration);
   VisitVariableProxy(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitModuleUrl(ModuleUrl* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kModuleUrl);
 }
 
 
@@ -83,6 +117,7 @@ void AstNumberingVisitor::VisitBreakStatement(BreakStatement* node) {
 
 void AstNumberingVisitor::VisitDebuggerStatement(DebuggerStatement* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kDebuggerStatement);
   node->set_base_id(ReserveIdRange(DebuggerStatement::num_ids()));
 }
 
@@ -90,6 +125,7 @@ void AstNumberingVisitor::VisitDebuggerStatement(DebuggerStatement* node) {
 void AstNumberingVisitor::VisitNativeFunctionLiteral(
     NativeFunctionLiteral* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kNativeFunctionLiteral);
   node->set_base_id(ReserveIdRange(NativeFunctionLiteral::num_ids()));
 }
 
@@ -108,6 +144,9 @@ void AstNumberingVisitor::VisitRegExpLiteral(RegExpLiteral* node) {
 
 void AstNumberingVisitor::VisitVariableProxy(VariableProxy* node) {
   IncrementNodeCount();
+  if (node->var()->IsLookupSlot()) {
+    DisableCrankshaft(kReferenceToAVariableWhichRequiresDynamicLookup);
+  }
   node->set_base_id(ReserveIdRange(VariableProxy::num_ids()));
 }
 
@@ -120,6 +159,7 @@ void AstNumberingVisitor::VisitThisFunction(ThisFunction* node) {
 
 void AstNumberingVisitor::VisitSuperReference(SuperReference* node) {
   IncrementNodeCount();
+  DisableTurbofan(kSuperReference);
   node->set_base_id(ReserveIdRange(SuperReference::num_ids()));
   Visit(node->this_var());
 }
@@ -127,6 +167,7 @@ void AstNumberingVisitor::VisitSuperReference(SuperReference* node) {
 
 void AstNumberingVisitor::VisitModuleDeclaration(ModuleDeclaration* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kModuleDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
@@ -134,6 +175,7 @@ void AstNumberingVisitor::VisitModuleDeclaration(ModuleDeclaration* node) {
 
 void AstNumberingVisitor::VisitImportDeclaration(ImportDeclaration* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kImportDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
@@ -141,18 +183,21 @@ void AstNumberingVisitor::VisitImportDeclaration(ImportDeclaration* node) {
 
 void AstNumberingVisitor::VisitModuleVariable(ModuleVariable* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kModuleVariable);
   Visit(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitModulePath(ModulePath* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kModulePath);
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitModuleStatement(ModuleStatement* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kModuleStatement);
   Visit(node->body());
 }
 
@@ -171,6 +216,7 @@ void AstNumberingVisitor::VisitReturnStatement(ReturnStatement* node) {
 
 void AstNumberingVisitor::VisitYield(Yield* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kYield);
   node->set_base_id(ReserveIdRange(Yield::num_ids()));
   Visit(node->generator_object());
   Visit(node->expression());
@@ -215,12 +261,17 @@ void AstNumberingVisitor::VisitFunctionDeclaration(FunctionDeclaration* node) {
 
 void AstNumberingVisitor::VisitModuleLiteral(ModuleLiteral* node) {
   IncrementNodeCount();
+  DisableCaching(kModuleLiteral);
   VisitBlock(node->body());
 }
 
 
 void AstNumberingVisitor::VisitCallRuntime(CallRuntime* node) {
   IncrementNodeCount();
+  if (node->is_jsruntime()) {
+    // Don't try to optimize JS runtime calls because we bailout on them.
+    DisableCrankshaft(kCallToAJavaScriptRuntimeFunction);
+  }
   node->set_base_id(ReserveIdRange(CallRuntime::num_ids()));
   VisitArguments(node->arguments());
 }
@@ -228,6 +279,7 @@ void AstNumberingVisitor::VisitCallRuntime(CallRuntime* node) {
 
 void AstNumberingVisitor::VisitWithStatement(WithStatement* node) {
   IncrementNodeCount();
+  DisableCrankshaft(kWithStatement);
   Visit(node->expression());
   Visit(node->statement());
 }
@@ -235,6 +287,7 @@ void AstNumberingVisitor::VisitWithStatement(WithStatement* node) {
 
 void AstNumberingVisitor::VisitDoWhileStatement(DoWhileStatement* node) {
   IncrementNodeCount();
+  DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(DoWhileStatement::num_ids()));
   Visit(node->body());
   Visit(node->cond());
@@ -243,6 +296,7 @@ void AstNumberingVisitor::VisitDoWhileStatement(DoWhileStatement* node) {
 
 void AstNumberingVisitor::VisitWhileStatement(WhileStatement* node) {
   IncrementNodeCount();
+  DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(WhileStatement::num_ids()));
   Visit(node->cond());
   Visit(node->body());
@@ -251,6 +305,7 @@ void AstNumberingVisitor::VisitWhileStatement(WhileStatement* node) {
 
 void AstNumberingVisitor::VisitTryCatchStatement(TryCatchStatement* node) {
   IncrementNodeCount();
+  DisableTurbofan(kTryCatchStatement);
   Visit(node->try_block());
   Visit(node->catch_block());
 }
@@ -258,6 +313,7 @@ void AstNumberingVisitor::VisitTryCatchStatement(TryCatchStatement* node) {
 
 void AstNumberingVisitor::VisitTryFinallyStatement(TryFinallyStatement* node) {
   IncrementNodeCount();
+  DisableTurbofan(kTryFinallyStatement);
   Visit(node->try_block());
   Visit(node->finally_block());
 }
@@ -298,6 +354,7 @@ void AstNumberingVisitor::VisitCompareOperation(CompareOperation* node) {
 
 void AstNumberingVisitor::VisitForInStatement(ForInStatement* node) {
   IncrementNodeCount();
+  DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(ForInStatement::num_ids()));
   Visit(node->each());
   Visit(node->enumerable());
@@ -307,6 +364,7 @@ void AstNumberingVisitor::VisitForInStatement(ForInStatement* node) {
 
 void AstNumberingVisitor::VisitForOfStatement(ForOfStatement* node) {
   IncrementNodeCount();
+  DisableTurbofan(kForOfStatement);
   node->set_base_id(ReserveIdRange(ForOfStatement::num_ids()));
   Visit(node->assign_iterator());
   Visit(node->next_result());
@@ -357,6 +415,7 @@ void AstNumberingVisitor::VisitCaseClause(CaseClause* node) {
 
 void AstNumberingVisitor::VisitForStatement(ForStatement* node) {
   IncrementNodeCount();
+  DisableSelfOptimization();
   node->set_base_id(ReserveIdRange(ForStatement::num_ids()));
   if (node->init() != NULL) Visit(node->init());
   if (node->cond() != NULL) Visit(node->cond());
@@ -367,6 +426,7 @@ void AstNumberingVisitor::VisitForStatement(ForStatement* node) {
 
 void AstNumberingVisitor::VisitClassLiteral(ClassLiteral* node) {
   IncrementNodeCount();
+  DisableTurbofan(kClassLiteral);
   node->set_base_id(ReserveIdRange(ClassLiteral::num_ids()));
   if (node->extends()) Visit(node->extends());
   if (node->constructor()) Visit(node->constructor());
@@ -467,6 +527,7 @@ void AstNumberingVisitor::Renumber(FunctionLiteral* node) {
   VisitStatements(node->body());
 
   node->set_ast_properties(&properties_);
+  node->set_dont_optimize_reason(dont_optimize_reason());
 }