| Index: runtime/vm/flow_graph_inliner.cc
|
| diff --git a/runtime/vm/flow_graph_inliner.cc b/runtime/vm/flow_graph_inliner.cc
|
| index a47f6b3b82fb7aef5e45787ca704879be8e23f7d..2956d0c8529eb03f005ebd721b7c14d2d368cb5b 100644
|
| --- a/runtime/vm/flow_graph_inliner.cc
|
| +++ b/runtime/vm/flow_graph_inliner.cc
|
| @@ -439,7 +439,7 @@ class CallSiteInliner : public ValueObject {
|
| }
|
|
|
| // Build the callee graph.
|
| - InliningContext inlining_context;
|
| + InliningContext inlining_context(caller_graph_, call);
|
| FlowGraphBuilder builder(*parsed_function, &inlining_context);
|
| builder.SetInitialBlockId(caller_graph_->max_block_id());
|
| FlowGraph* callee_graph;
|
| @@ -562,7 +562,7 @@ class CallSiteInliner : public ValueObject {
|
| isolate);
|
|
|
| // Plug result in the caller graph.
|
| - inlining_context.ReplaceCall(caller_graph_, call, callee_graph);
|
| + inlining_context.ReplaceCall(callee_graph);
|
|
|
| // Replace each stub with the actual argument or the caller's constant.
|
| // Nulls denote optional parameters for which no actual was given.
|
| @@ -880,7 +880,7 @@ void FlowGraphInliner::Inline() {
|
| inliner.InlineCalls();
|
|
|
| if (inliner.inlined()) {
|
| - flow_graph_->RepairGraphAfterInlining();
|
| + flow_graph_->DiscoverBlocks();
|
| if (FLAG_trace_inlining) {
|
| OS::Print("Inlining growth factor: %f\n", inliner.GrowthFactor());
|
| if (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized) {
|
|
|