| Index: runtime/vm/flow_graph_inliner.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_inliner.cc (revision 42068)
|
| +++ runtime/vm/flow_graph_inliner.cc (working copy)
|
| @@ -192,7 +192,7 @@
|
| FlowGraph* flow_graph)
|
| : call(call_arg),
|
| ratio(0.0),
|
| - caller(&flow_graph->parsed_function().function()) {}
|
| + caller(&flow_graph->parsed_function()->function()) {}
|
| };
|
|
|
| struct StaticCallInfo {
|
| @@ -202,7 +202,7 @@
|
| StaticCallInfo(StaticCallInstr* value, FlowGraph* flow_graph)
|
| : call(value),
|
| ratio(0.0),
|
| - caller(&flow_graph->parsed_function().function()) {}
|
| + caller(&flow_graph->parsed_function()->function()) {}
|
| };
|
|
|
| struct ClosureCallInfo {
|
| @@ -210,7 +210,7 @@
|
| const Function* caller;
|
| ClosureCallInfo(ClosureCallInstr* value, FlowGraph* flow_graph)
|
| : call(value),
|
| - caller(&flow_graph->parsed_function().function()) {}
|
| + caller(&flow_graph->parsed_function()->function()) {}
|
| };
|
|
|
| const GrowableArray<InstanceCallInfo>& instance_calls() const {
|
| @@ -286,7 +286,7 @@
|
| FlowGraph* graph,
|
| intptr_t depth,
|
| GrowableArray<InlinedInfo>* inlined_info) {
|
| - const Function* caller = &graph->parsed_function().function();
|
| + const Function* caller = &graph->parsed_function()->function();
|
| Function& target = Function::ZoneHandle();
|
| for (BlockIterator block_it = graph->postorder_iterator();
|
| !block_it.Done();
|
| @@ -353,7 +353,7 @@
|
| // Method not inlined because inlining too deep and method
|
| // not recognized.
|
| if (FLAG_print_inlining_tree) {
|
| - const Function* caller = &graph->parsed_function().function();
|
| + const Function* caller = &graph->parsed_function()->function();
|
| const Function* target =
|
| &Function::ZoneHandle(
|
| instance_call->ic_data().GetTargetAt(0));
|
| @@ -370,7 +370,7 @@
|
| // Method not inlined because inlining too deep and method
|
| // not recognized.
|
| if (FLAG_print_inlining_tree) {
|
| - const Function* caller = &graph->parsed_function().function();
|
| + const Function* caller = &graph->parsed_function()->function();
|
| const Function* target = &static_call->function();
|
| inlined_info->Add(InlinedInfo(
|
| caller, target, depth + 1, static_call, "Too deep"));
|
| @@ -521,7 +521,7 @@
|
| void InlineCalls() {
|
| // If inlining depth is less then one abort.
|
| if (FLAG_inlining_depth_threshold < 1) return;
|
| - if (caller_graph_->parsed_function().function().deoptimization_counter() >=
|
| + if (caller_graph_->parsed_function()->function().deoptimization_counter() >=
|
| FLAG_deoptimization_counter_inlining_threshold) {
|
| return;
|
| }
|
| @@ -1706,7 +1706,7 @@
|
|
|
|
|
| void FlowGraphInliner::CollectGraphInfo(FlowGraph* flow_graph, bool force) {
|
| - const Function& function = flow_graph->parsed_function().function();
|
| + const Function& function = flow_graph->parsed_function()->function();
|
| if (force || (function.optimized_instruction_count() == 0)) {
|
| GraphInfoCollector info;
|
| info.Collect(*flow_graph);
|
| @@ -1743,7 +1743,7 @@
|
| // We might later use it for an early bailout from the inlining.
|
| CollectGraphInfo(flow_graph_);
|
|
|
| - const Function& top = flow_graph_->parsed_function().function();
|
| + const Function& top = flow_graph_->parsed_function()->function();
|
| if ((FLAG_inlining_filter != NULL) &&
|
| (strstr(top.ToFullyQualifiedCString(), FLAG_inlining_filter) == NULL)) {
|
| return;
|
| @@ -1754,7 +1754,7 @@
|
| if (FLAG_trace_inlining &&
|
| (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized)) {
|
| OS::Print("Before Inlining of %s\n", flow_graph_->
|
| - parsed_function().function().ToFullyQualifiedCString());
|
| + parsed_function()->function().ToFullyQualifiedCString());
|
| FlowGraphPrinter printer(*flow_graph_);
|
| printer.PrintBlocks();
|
| }
|
| @@ -1771,7 +1771,7 @@
|
| OS::Print("Inlining growth factor: %f\n", inliner.GrowthFactor());
|
| if (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized) {
|
| OS::Print("After Inlining of %s\n", flow_graph_->
|
| - parsed_function().function().ToFullyQualifiedCString());
|
| + parsed_function()->function().ToFullyQualifiedCString());
|
| FlowGraphPrinter printer(*flow_graph_);
|
| printer.PrintBlocks();
|
| }
|
|
|