Cleanups in the inliner.

runtime/vm/flow_graph_inliner.cc

Index: runtime/vm/flow_graph_inliner.cc
===================================================================
--- runtime/vm/flow_graph_inliner.cc	(revision 13915)
+++ runtime/vm/flow_graph_inliner.cc	(working copy)
@@ -24,8 +24,6 @@
 // TODO(srdjan): set to 3 once crash in apidoc.dart is resolved.
 DEFINE_FLAG(int, inlining_depth_threshold, 3,
     "Inline recursively up to threshold depth (default 3)");
-DEFINE_FLAG(bool, inline_control_flow, true,
-    "Inline functions with control flow.");
 DECLARE_FLAG(bool, print_flow_graph);
 DECLARE_FLAG(int, deoptimization_counter_threshold);
 DECLARE_FLAG(bool, verify_compiler);
@@ -172,7 +170,7 @@
         inlining_depth_(1),
         collected_call_sites_(NULL),
         inlining_call_sites_(NULL),
-        function_cache() { }
+        function_cache_() { }
 
   void InlineCalls() {
     // If inlining depth is less then one abort.
@@ -269,7 +267,7 @@
     if (setjmp(*jump.Set()) == 0) {
       // Parse the callee function.
       bool in_cache;
-      ParsedFunction* parsed_function = ParseFunction(function, &in_cache);
+      ParsedFunction* parsed_function = GetParsedFunction(function, &in_cache);
 
       // Load IC data for the callee.
       if (function.HasCode()) {
@@ -284,16 +282,6 @@
       FlowGraph* callee_graph =
           builder.BuildGraph(FlowGraphBuilder::kValueContext);
 
-      // Abort if the callee graph contains control flow.
-      if (!FLAG_inline_control_flow &&
-          (callee_graph->preorder().length() != 2)) {
-        function.set_is_inlinable(false);
-        isolate->set_long_jump_base(base);
-        isolate->set_ic_data_array(prev_ic_data.raw());
-        TRACE_INLINING(OS::Print("     Bailout: control flow\n"));
-        return false;
-      }
-
       // Compute SSA on the callee graph, catching bailouts.
       callee_graph->ComputeSSA(next_ssa_temp_index_);
       callee_graph->ComputeUseLists();
@@ -357,7 +345,7 @@
       TRACE_INLINING(OS::Print("     Success\n"));
 
       // Add the function to the cache.
-      if (!in_cache) function_cache.Add(parsed_function);
+      if (!in_cache) function_cache_.Add(parsed_function);
 
       // Check that inlining maintains use lists.
       DEBUG_ASSERT(!FLAG_verify_compiler || caller_graph_->ValidateUseLists());
@@ -383,10 +371,10 @@
 
   // Parse a function reusing the cache if possible. Returns true if the
   // function was in the cache.
-  ParsedFunction* ParseFunction(const Function& function, bool* in_cache) {
+  ParsedFunction* GetParsedFunction(const Function& function, bool* in_cache) {
     // TODO(zerny): Use a hash map for the cache.
-    for (intptr_t i = 0; i < function_cache.length(); ++i) {
-      ParsedFunction* parsed_function = function_cache[i];
+    for (intptr_t i = 0; i < function_cache_.length(); ++i) {
+      ParsedFunction* parsed_function = function_cache_[i];
       if (parsed_function->function().raw() == function.raw()) {
         *in_cache = true;
         SourceLabelResetter reset;
@@ -470,7 +458,7 @@
   intptr_t inlining_depth_;
   CallSites* collected_call_sites_;
   CallSites* inlining_call_sites_;
-  GrowableArray<ParsedFunction*> function_cache;
+  GrowableArray<ParsedFunction*> function_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(CallSiteInliner);
 };