[turbofan] Run inlining within the regular reducer fixpoint.

src/compiler/js-inlining-heuristic.cc

 // Copyright 2015 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/js-inlining-heuristic.h"
 
 #include "src/compiler.h"
-#include "src/compiler/dead-code-elimination.h"  // TODO(mstarzinger): Remove!
 #include "src/compiler/node-matchers.h"
 #include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 Reduction JSInliningHeuristic::Reduce(Node* node) {
   if (node->opcode() != IrOpcode::kJSCallFunction) return NoChange();
 
+  // Check if we already saw that {node} before, and if so, just skip it.
+  if (seen_.find(node->id()) != seen_.end()) return NoChange();
+  seen_.insert(node->id());
+
   Node* callee = node->InputAt(0);
   HeapObjectMatcher match(callee);
   if (!match.HasValue() || !match.Value()->IsJSFunction()) return NoChange();
   Handle<JSFunction> function = Handle<JSFunction>::cast(match.Value());
 
   // Functions marked with %SetForceInlineFlag are immediately inlined.
   if (function->shared()->force_inline()) {
     return inliner_.ReduceJSCallFunction(node, function);
   }
 
@@ skipping 23 matching lines @@
 
   // Quick check on the size of the AST to avoid parsing large candidate.
   if (function->shared()->ast_node_count() > FLAG_max_inlined_nodes) {
     return NoChange();
   }
 
   // Avoid inlining within or across the boundary of asm.js code.
   if (info_->shared_info()->asm_function()) return NoChange();
   if (function->shared()->asm_function()) return NoChange();
 
+  // Stop inlinining once the maximum allowed level is reached.
+  int level = 0;
+  for (Node* frame_state = NodeProperties::GetFrameStateInput(node, 1);
+       frame_state->opcode() == IrOpcode::kFrameState;
+       frame_state = NodeProperties::GetFrameStateInput(frame_state, 0)) {
+    if (++level > FLAG_max_inlining_levels) return NoChange();
+  }
+
   // Gather feedback on how often this call site has been hit before.
   CallFunctionParameters p = CallFunctionParametersOf(node->op());
   int calls = -1;  // Same default as CallICNexus::ExtractCallCount.
   if (p.feedback().IsValid()) {
     CallICNexus nexus(p.feedback().vector(), p.feedback().slot());
     calls = nexus.ExtractCallCount();
   }
 
   // ---------------------------------------------------------------------------
   // Everything above this line is part of the inlining heuristic.
   // ---------------------------------------------------------------------------
 
   // In the general case we remember the candidate for later.
   candidates_.insert({function, node, calls});
   return NoChange();
 }
 
 
-void JSInliningHeuristic::ProcessCandidates() {
-  if (candidates_.empty()) return;  // Nothing to do without candidates.
+void JSInliningHeuristic::Finalize() {
   if (FLAG_trace_turbo_inlining) PrintCandidates();
 
-  int cumulative_count = 0;
-  for (const Candidate& candidate : candidates_) {
-    if (cumulative_count > FLAG_max_inlined_nodes_cumulative) break;
+  while (!candidates_.empty()) {
+    if (cumulative_count_ > FLAG_max_inlined_nodes_cumulative) break;
+    auto i = candidates_.begin();
+    Candidate const& candidate = *i;
     inliner_.ReduceJSCallFunction(candidate.node, candidate.function);
-    cumulative_count += candidate.function->shared()->ast_node_count();
+    cumulative_count_ += candidate.function->shared()->ast_node_count();
+    candidates_.erase(i);
   }
-
-  // TODO(mstarzinger): Temporary workaround to eliminate dead control from the
-  // graph being introduced by the inliner. Make this part of the pipeline.
-  GraphReducer graph_reducer(local_zone_, jsgraph_->graph(), jsgraph_->Dead());
-  DeadCodeElimination dead_code_elimination(&graph_reducer, jsgraph_->graph(),
-                                            jsgraph_->common());
-  graph_reducer.AddReducer(&dead_code_elimination);
-  graph_reducer.ReduceGraph();
 }
 
 
 bool JSInliningHeuristic::CandidateCompare::operator()(
     const Candidate& left, const Candidate& right) const {
   return left.node != right.node && left.calls >= right.calls;
 }
 
 
 void JSInliningHeuristic::PrintCandidates() {
   PrintF("Candidates for inlining (size=%zu):\n", candidates_.size());
   for (const Candidate& candidate : candidates_) {
     PrintF("  id:%d, calls:%d, size[source]:%d, size[ast]:%d / %s\n",
            candidate.node->id(), candidate.calls,
            candidate.function->shared()->SourceSize(),
            candidate.function->shared()->ast_node_count(),
            candidate.function->shared()->DebugName()->ToCString().get());
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8