From 47396c414209661ef8e11e35085ab5b2acbfe3c3 Mon Sep 17 00:00:00 2001 From: bmeurer Date: Thu, 12 Nov 2015 20:50:46 -0800 Subject: [PATCH] [turbofan] Don't abort inlining on first failed attempt. Continue with the other candidates in case of a failed attempt to inline a certain candidate. TBR=mstarzinger@chromium.org BUG=v8:4493 LOG=n Review URL: https://codereview.chromium.org/1435373002 Cr-Commit-Position: refs/heads/master@{#31975} --- src/compiler/js-inlining-heuristic.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/compiler/js-inlining-heuristic.cc b/src/compiler/js-inlining-heuristic.cc index 74b8723605..38595dbf95 100644 --- a/src/compiler/js-inlining-heuristic.cc +++ b/src/compiler/js-inlining-heuristic.cc @@ -101,12 +101,18 @@ void JSInliningHeuristic::Finalize() { // We inline at most one candidate in every iteration of the fixpoint. // This is to ensure that we don't consume the full inlining budget // on things that aren't called very often. - if (cumulative_count_ > FLAG_max_inlined_nodes_cumulative) return; - auto i = candidates_.begin(); - Candidate const& candidate = *i; - inliner_.ReduceJSCall(candidate.node, candidate.function); - cumulative_count_ += candidate.function->shared()->ast_node_count(); - candidates_.erase(i); + // TODO(bmeurer): Use std::priority_queue instead of std::set here. + while (!candidates_.empty()) { + if (cumulative_count_ > FLAG_max_inlined_nodes_cumulative) return; + auto i = candidates_.begin(); + Candidate candidate = *i; + candidates_.erase(i); + Reduction r = inliner_.ReduceJSCall(candidate.node, candidate.function); + if (r.Changed()) { + cumulative_count_ += candidate.function->shared()->ast_node_count(); + return; + } + } }