| Index: runtime/vm/flow_graph_inliner.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_inliner.cc (revision 20999)
|
| +++ runtime/vm/flow_graph_inliner.cc (working copy)
|
| @@ -292,7 +292,7 @@
|
|
|
| class CallSiteInliner : public ValueObject {
|
| public:
|
| - CallSiteInliner(FlowGraph* flow_graph, GrowableArray<Field*>* guarded_fields)
|
| + explicit CallSiteInliner(FlowGraph* flow_graph)
|
| : caller_graph_(flow_graph),
|
| inlined_(false),
|
| initial_size_(flow_graph->InstructionCount()),
|
| @@ -300,8 +300,7 @@
|
| inlining_depth_(1),
|
| collected_call_sites_(NULL),
|
| inlining_call_sites_(NULL),
|
| - function_cache_(),
|
| - guarded_fields_(guarded_fields) { }
|
| + function_cache_() { }
|
|
|
| // Inlining heuristics based on Cooper et al. 2008.
|
| bool ShouldWeInline(intptr_t instr_count,
|
| @@ -502,7 +501,7 @@
|
| &CompilerStats::graphinliner_opt_timer,
|
| isolate);
|
| // TODO(zerny): Do more optimization passes on the callee graph.
|
| - FlowGraphOptimizer optimizer(callee_graph, guarded_fields_);
|
| + FlowGraphOptimizer optimizer(callee_graph);
|
| optimizer.ApplyICData();
|
| DEBUG_ASSERT(callee_graph->VerifyUseLists());
|
| }
|
| @@ -835,7 +834,6 @@
|
| CallSites* collected_call_sites_;
|
| CallSites* inlining_call_sites_;
|
| GrowableArray<ParsedFunction*> function_cache_;
|
| - GrowableArray<Field*>* guarded_fields_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CallSiteInliner);
|
| };
|
| @@ -876,7 +874,7 @@
|
| printer.PrintBlocks();
|
| }
|
|
|
| - CallSiteInliner inliner(flow_graph_, guarded_fields_);
|
| + CallSiteInliner inliner(flow_graph_);
|
| inliner.InlineCalls();
|
|
|
| if (inliner.inlined()) {
|
|
|