AstNumberingVisitor does the work of AstConstructionVisitor

src/ast-numbering.cc

Index: src/ast-numbering.cc
diff --git a/src/ast-numbering.cc b/src/ast-numbering.cc
index e87842405e689a0aee131ac299b6111a1f285872..c84d93881ba34e07b165261a6d37f7239de4cb90 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);
   }
 
@@ -39,7 +42,77 @@ class AstNumberingVisitor FINAL : public AstVisitor {
     return tmp;
   }
 
+  template <typename Node>
+  void AddSlotNode(Node* node) {
+    FeedbackVectorRequirements reqs = node->ComputeFeedbackRequirements();
+    if (reqs.slots() > 0) {
+      node->SetFirstFeedbackSlot(
+          FeedbackVectorSlot(properties_.feedback_slots()));
+      properties_.increase_feedback_slots(reqs.slots());
+    }
+    if (reqs.ic_slots() > 0) {
+      node->SetFirstFeedbackICSlot(
+          FeedbackVectorICSlot(properties_.ic_feedback_slots()));
+      properties_.increase_ic_feedback_slots(reqs.ic_slots());
+    }
+  }
+
+  void RegularNode() { properties_.add_node_count(1); }
+  template <typename Node>
+  void RegularNodeWithFeedbackSlots(Node* node) {
+    properties_.add_node_count(1);
+    AddSlotNode(node);
+  }
+  void DontOptimizeNode(BailoutReason reason) {
+    properties_.add_node_count(1);
+    dont_crankshaft_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  template <typename Node>
+  void DontOptimizeNodeWithFeedbackSlots(Node* node, BailoutReason reason) {
+    properties_.add_node_count(1);
+    AddSlotNode(node);
+    dont_crankshaft_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  // 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 DontTurbofanNode(BailoutReason reason) {
+    properties_.add_node_count(1);
+    dont_crankshaft_reason_ = reason;
+    dont_turbofan_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  template <typename Node>
+  void DontTurbofanNodeWithFeedbackSlots(Node* node, BailoutReason reason) {
+    properties_.add_node_count(1);
+    AddSlotNode(node);
+    dont_crankshaft_reason_ = reason;
+    dont_turbofan_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  void DontSelfOptimizeNode() {
+    properties_.add_node_count(1);
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  template <typename Node>
+  void DontSelfOptimizeNodeWithFeedbackSlots(Node* node) {
+    properties_.add_node_count(1);
+    AddSlotNode(node);
+    properties_.flags()->Add(kDontSelfOptimize);
+  }
+  void DontCacheNode(BailoutReason reason) {
+    properties_.add_node_count(1);
+    dont_crankshaft_reason_ = reason;
+    properties_.flags()->Add(kDontSelfOptimize);
+    properties_.flags()->Add(kDontCache);
+  }
+
   int next_id_;
+  AstProperties properties_;
+  BailoutReason dont_crankshaft_reason_;
+  BailoutReason dont_turbofan_reason_;
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
   DISALLOW_COPY_AND_ASSIGN(AstNumberingVisitor);
@@ -47,102 +120,132 @@ class AstNumberingVisitor FINAL : public AstVisitor {
 
 
 void AstNumberingVisitor::VisitVariableDeclaration(VariableDeclaration* node) {
+  RegularNode();
   VisitVariableProxy(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitExportDeclaration(ExportDeclaration* node) {
+  DontOptimizeNode(kExportDeclaration);
   VisitVariableProxy(node->proxy());
 }
 
 
-void AstNumberingVisitor::VisitModuleUrl(ModuleUrl* node) {}
+void AstNumberingVisitor::VisitModuleUrl(ModuleUrl* node) {
+  DontOptimizeNode(kModuleUrl);
+}
 
 
-void AstNumberingVisitor::VisitEmptyStatement(EmptyStatement* node) {}
+void AstNumberingVisitor::VisitEmptyStatement(EmptyStatement* node) {
+  RegularNode();
+}
 
 
-void AstNumberingVisitor::VisitContinueStatement(ContinueStatement* node) {}
+void AstNumberingVisitor::VisitContinueStatement(ContinueStatement* node) {
+  RegularNode();
+}
 
 
-void AstNumberingVisitor::VisitBreakStatement(BreakStatement* node) {}
+void AstNumberingVisitor::VisitBreakStatement(BreakStatement* node) {
+  RegularNode();
+}
 
 
 void AstNumberingVisitor::VisitDebuggerStatement(DebuggerStatement* node) {
+  DontOptimizeNode(kDebuggerStatement);
   node->set_base_id(ReserveIdRange(DebuggerStatement::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitNativeFunctionLiteral(
     NativeFunctionLiteral* node) {
+  DontOptimizeNode(kNativeFunctionLiteral);
   node->set_base_id(ReserveIdRange(NativeFunctionLiteral::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitLiteral(Literal* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(Literal::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitRegExpLiteral(RegExpLiteral* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(RegExpLiteral::num_ids()));
 }
 
 
+// In theory, for VariableProxy we'd have to add:
+// if (node->var()->IsLookupSlot())
+//   set_dont_optimize_reason(kReferenceToAVariableWhichRequiresDynamicLookup);
+// But node->var() is usually not bound yet at VariableProxy creation time, and
+// LOOKUP variables only result from constructs that cannot be inlined anyway.
 void AstNumberingVisitor::VisitVariableProxy(VariableProxy* node) {
+  RegularNodeWithFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(VariableProxy::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitThisFunction(ThisFunction* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(ThisFunction::num_ids()));
 }
 
 
 void AstNumberingVisitor::VisitSuperReference(SuperReference* node) {
+  DontTurbofanNodeWithFeedbackSlots(node, kSuperReference);
   node->set_base_id(ReserveIdRange(SuperReference::num_ids()));
   Visit(node->this_var());
 }
 
 
 void AstNumberingVisitor::VisitModuleDeclaration(ModuleDeclaration* node) {
+  DontOptimizeNode(kModuleDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitImportDeclaration(ImportDeclaration* node) {
+  DontOptimizeNode(kImportDeclaration);
   VisitVariableProxy(node->proxy());
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitModuleVariable(ModuleVariable* node) {
+  DontOptimizeNode(kModuleVariable);
   Visit(node->proxy());
 }
 
 
 void AstNumberingVisitor::VisitModulePath(ModulePath* node) {
+  DontOptimizeNode(kModulePath);
   Visit(node->module());
 }
 
 
 void AstNumberingVisitor::VisitModuleStatement(ModuleStatement* node) {
+  DontOptimizeNode(kModuleStatement);
   Visit(node->body());
 }
 
 
 void AstNumberingVisitor::VisitExpressionStatement(ExpressionStatement* node) {
+  RegularNode();
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitReturnStatement(ReturnStatement* node) {
+  RegularNode();
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitYield(Yield* node) {
+  DontOptimizeNodeWithFeedbackSlots(node, kYield);
   node->set_base_id(ReserveIdRange(Yield::num_ids()));
   Visit(node->generator_object());
   Visit(node->expression());
@@ -150,24 +253,28 @@ void AstNumberingVisitor::VisitYield(Yield* node) {
 
 
 void AstNumberingVisitor::VisitThrow(Throw* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(Throw::num_ids()));
   Visit(node->exception());
 }
 
 
 void AstNumberingVisitor::VisitUnaryOperation(UnaryOperation* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(UnaryOperation::num_ids()));
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitCountOperation(CountOperation* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(CountOperation::num_ids()));
   Visit(node->expression());
 }
 
 
 void AstNumberingVisitor::VisitBlock(Block* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(Block::num_ids()));
   if (node->scope() != NULL) VisitDeclarations(node->scope()->declarations());
   VisitStatements(node->statements());
@@ -175,29 +282,38 @@ void AstNumberingVisitor::VisitBlock(Block* node) {
 
 
 void AstNumberingVisitor::VisitFunctionDeclaration(FunctionDeclaration* node) {
+  RegularNode();
   VisitVariableProxy(node->proxy());
   VisitFunctionLiteral(node->fun());
 }
 
 
 void AstNumberingVisitor::VisitModuleLiteral(ModuleLiteral* node) {
+  DontCacheNode(kModuleLiteral);
   VisitBlock(node->body());
 }
 
 
 void AstNumberingVisitor::VisitCallRuntime(CallRuntime* node) {
+  RegularNodeWithFeedbackSlots(node);
+  if (node->is_jsruntime()) {
+    // Don't try to optimize JS runtime calls because we bailout on them.
+    dont_crankshaft_reason_ = kCallToAJavaScriptRuntimeFunction;
+  }
   node->set_base_id(ReserveIdRange(CallRuntime::num_ids()));
   VisitArguments(node->arguments());
 }
 
 
 void AstNumberingVisitor::VisitWithStatement(WithStatement* node) {
+  DontOptimizeNode(kWithStatement);
   Visit(node->expression());
   Visit(node->statement());
 }
 
 
 void AstNumberingVisitor::VisitDoWhileStatement(DoWhileStatement* node) {
+  DontSelfOptimizeNode();
   node->set_base_id(ReserveIdRange(DoWhileStatement::num_ids()));
   Visit(node->body());
   Visit(node->cond());
@@ -205,6 +321,7 @@ void AstNumberingVisitor::VisitDoWhileStatement(DoWhileStatement* node) {
 
 
 void AstNumberingVisitor::VisitWhileStatement(WhileStatement* node) {
+  DontSelfOptimizeNode();
   node->set_base_id(ReserveIdRange(WhileStatement::num_ids()));
   Visit(node->cond());
   Visit(node->body());
@@ -212,18 +329,21 @@ void AstNumberingVisitor::VisitWhileStatement(WhileStatement* node) {
 
 
 void AstNumberingVisitor::VisitTryCatchStatement(TryCatchStatement* node) {
+  DontTurbofanNode(kTryCatchStatement);
   Visit(node->try_block());
   Visit(node->catch_block());
 }
 
 
 void AstNumberingVisitor::VisitTryFinallyStatement(TryFinallyStatement* node) {
+  DontTurbofanNode(kTryFinallyStatement);
   Visit(node->try_block());
   Visit(node->finally_block());
 }
 
 
 void AstNumberingVisitor::VisitProperty(Property* node) {
+  RegularNodeWithFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(Property::num_ids()));
   Visit(node->key());
   Visit(node->obj());
@@ -231,6 +351,7 @@ void AstNumberingVisitor::VisitProperty(Property* node) {
 
 
 void AstNumberingVisitor::VisitAssignment(Assignment* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(Assignment::num_ids()));
   if (node->is_compound()) VisitBinaryOperation(node->binary_operation());
   Visit(node->target());
@@ -239,6 +360,7 @@ void AstNumberingVisitor::VisitAssignment(Assignment* node) {
 
 
 void AstNumberingVisitor::VisitBinaryOperation(BinaryOperation* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(BinaryOperation::num_ids()));
   Visit(node->left());
   Visit(node->right());
@@ -246,6 +368,7 @@ void AstNumberingVisitor::VisitBinaryOperation(BinaryOperation* node) {
 
 
 void AstNumberingVisitor::VisitCompareOperation(CompareOperation* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(CompareOperation::num_ids()));
   Visit(node->left());
   Visit(node->right());
@@ -253,6 +376,7 @@ void AstNumberingVisitor::VisitCompareOperation(CompareOperation* node) {
 
 
 void AstNumberingVisitor::VisitForInStatement(ForInStatement* node) {
+  DontSelfOptimizeNodeWithFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(ForInStatement::num_ids()));
   Visit(node->each());
   Visit(node->enumerable());
@@ -261,6 +385,7 @@ void AstNumberingVisitor::VisitForInStatement(ForInStatement* node) {
 
 
 void AstNumberingVisitor::VisitForOfStatement(ForOfStatement* node) {
+  DontTurbofanNode(kForOfStatement);
   node->set_base_id(ReserveIdRange(ForOfStatement::num_ids()));
   Visit(node->assign_iterator());
   Visit(node->next_result());
@@ -271,6 +396,7 @@ void AstNumberingVisitor::VisitForOfStatement(ForOfStatement* node) {
 
 
 void AstNumberingVisitor::VisitConditional(Conditional* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(Conditional::num_ids()));
   Visit(node->condition());
   Visit(node->then_expression());
@@ -279,6 +405,7 @@ void AstNumberingVisitor::VisitConditional(Conditional* node) {
 
 
 void AstNumberingVisitor::VisitIfStatement(IfStatement* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(IfStatement::num_ids()));
   Visit(node->condition());
   Visit(node->then_statement());
@@ -289,6 +416,7 @@ void AstNumberingVisitor::VisitIfStatement(IfStatement* node) {
 
 
 void AstNumberingVisitor::VisitSwitchStatement(SwitchStatement* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(SwitchStatement::num_ids()));
   Visit(node->tag());
   ZoneList<CaseClause*>* cases = node->cases();
@@ -299,6 +427,7 @@ void AstNumberingVisitor::VisitSwitchStatement(SwitchStatement* node) {
 
 
 void AstNumberingVisitor::VisitCaseClause(CaseClause* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(CaseClause::num_ids()));
   if (!node->is_default()) Visit(node->label());
   VisitStatements(node->statements());
@@ -306,6 +435,7 @@ void AstNumberingVisitor::VisitCaseClause(CaseClause* node) {
 
 
 void AstNumberingVisitor::VisitForStatement(ForStatement* node) {
+  DontSelfOptimizeNode();
   node->set_base_id(ReserveIdRange(ForStatement::num_ids()));
   if (node->init() != NULL) Visit(node->init());
   if (node->cond() != NULL) Visit(node->cond());
@@ -315,6 +445,7 @@ void AstNumberingVisitor::VisitForStatement(ForStatement* node) {
 
 
 void AstNumberingVisitor::VisitClassLiteral(ClassLiteral* node) {
+  DontTurbofanNode(kClassLiteral);
   node->set_base_id(ReserveIdRange(ClassLiteral::num_ids()));
   if (node->extends()) Visit(node->extends());
   if (node->constructor()) Visit(node->constructor());
@@ -325,6 +456,7 @@ void AstNumberingVisitor::VisitClassLiteral(ClassLiteral* node) {
 
 
 void AstNumberingVisitor::VisitObjectLiteral(ObjectLiteral* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(ObjectLiteral::num_ids()));
   for (int i = 0; i < node->properties()->length(); i++) {
     VisitObjectLiteralProperty(node->properties()->at(i));
@@ -340,6 +472,7 @@ void AstNumberingVisitor::VisitObjectLiteralProperty(
 
 
 void AstNumberingVisitor::VisitArrayLiteral(ArrayLiteral* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(node->num_ids()));
   for (int i = 0; i < node->values()->length(); i++) {
     Visit(node->values()->at(i));
@@ -348,6 +481,7 @@ void AstNumberingVisitor::VisitArrayLiteral(ArrayLiteral* node) {
 
 
 void AstNumberingVisitor::VisitCall(Call* node) {
+  RegularNodeWithFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(Call::num_ids()));
   Visit(node->expression());
   VisitArguments(node->arguments());
@@ -355,6 +489,7 @@ void AstNumberingVisitor::VisitCall(Call* node) {
 
 
 void AstNumberingVisitor::VisitCallNew(CallNew* node) {
+  RegularNodeWithFeedbackSlots(node);
   node->set_base_id(ReserveIdRange(CallNew::num_ids()));
   Visit(node->expression());
   VisitArguments(node->arguments());
@@ -385,6 +520,7 @@ void AstNumberingVisitor::VisitArguments(ZoneList<Expression*>* arguments) {
 
 
 void AstNumberingVisitor::VisitFunctionLiteral(FunctionLiteral* node) {
+  RegularNode();
   node->set_base_id(ReserveIdRange(FunctionLiteral::num_ids()));
   // We don't recurse into the declarations or body of the function literal:
   // you have to separately Renumber() each FunctionLiteral that you compile.
@@ -404,6 +540,12 @@ void AstNumberingVisitor::Renumber(FunctionLiteral* node) {
     Visit(scope->function());
   }
   VisitStatements(node->body());
+
+  node->set_ast_properties(&properties_);
+  BailoutReason dont_optimize_reason = (dont_turbofan_reason_ != kNoReason)
+                                           ? dont_turbofan_reason_
+                                           : dont_crankshaft_reason_;
+  node->set_dont_optimize_reason(dont_optimize_reason);
 }
 
 
@@ -412,5 +554,16 @@ bool AstNumbering::Renumber(FunctionLiteral* function, Zone* zone) {
   visitor.Renumber(function);
   return !visitor.HasStackOverflow();
 }
+
+bool AstNumbering::Renumber(FunctionLiteral* function,
+                            Handle<SharedFunctionInfo> shared, Zone* zone) {

[Sven Panne, 2014/10/22 13:08:52]

I don't think this actually belongs here: It just copies from the
FunctionLiteral to the SharedFunctionInfo. Perhaps this should live in
SharedFunctionInfo or even in some yet-to-be-implemented part of the compilation
pipeline (frontend). Anyway, having another Renumber method is just confusing.

[wingo, 2014/10/22 13:23:01]

ACK.  Unfortunately the fix is a bit more involved, as this copying usually
should happen after Renumber is run, but Renumber is run from a few places, so
we need a central place to call Renumber -- yet-to-be-implemented, as you say.

+  if (!AstNumbering::Renumber(function, zone)) return false;
+  if (!shared.is_null()) {
+    shared->set_bailout_reason(function->dont_optimize_reason());
+    shared->set_ast_node_count(function->ast_node_count());
+    shared->set_dont_cache(function->flags()->Contains(kDontCache));
+  }
+  return true;
+}
 }
 }  // namespace v8::internal