Clean up handling of guarded fields in the flow graph builder.

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_inliner.h"
 
 #include "vm/block_scheduler.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
@@ skipping 524 matching lines @@
       Array& ic_data_array = Array::Handle();
       if (function.HasCode()) {
         const Code& unoptimized_code =
             Code::Handle(function.unoptimized_code());
         ic_data_array = unoptimized_code.ExtractTypeFeedbackArray();
       }
 
       // Build the callee graph.
       InlineExitCollector* exit_collector =
           new InlineExitCollector(caller_graph_, call);
-      GrowableArray<const Field*> inlined_guarded_fields;
-      FlowGraphBuilder* builder = new FlowGraphBuilder(parsed_function,
-                                                       ic_data_array,
-                                                       exit_collector,
-                                                       &inlined_guarded_fields,
-                                                       Isolate::kNoDeoptId);
-      builder->SetInitialBlockId(caller_graph_->max_block_id());
+      FlowGraphBuilder builder(parsed_function,
+                               ic_data_array,
+                               exit_collector,
+                               Isolate::kNoDeoptId);
+      builder.SetInitialBlockId(caller_graph_->max_block_id());
       FlowGraph* callee_graph;
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphinliner_build_timer,
                          isolate);
-        callee_graph = builder->BuildGraph();
+        callee_graph = builder.BuildGraph();
       }
 
       // The parameter stubs are a copy of the actual arguments providing
       // concrete information about the values, for example constant values,
       // without linking between the caller and callee graphs.
       // TODO(zerny): Put more information in the stubs, eg, type information.
       ZoneGrowableArray<Definition*>* param_stubs =
           new ZoneGrowableArray<Definition*>(function.NumParameters());
 
       // Create a parameter stub for each fixed positional parameter.
@@ skipping 96 matching lines @@
       inlined_size_ += size;
       isolate->set_long_jump_base(base);
       isolate->set_deopt_id(prev_deopt_id);
 
       call_data->callee_graph = callee_graph;
       call_data->parameter_stubs = param_stubs;
       call_data->exit_collector = exit_collector;
 
       // When inlined, we add the guarded fields of the callee to the caller's
       // list of guarded fields.
-      for (intptr_t i = 0; i < inlined_guarded_fields.length(); ++i) {
-        caller_graph_->builder().AddToGuardedFields(*inlined_guarded_fields[i]);
+      for (intptr_t i = 0; i < callee_graph->guarded_fields()->length(); ++i) {
+        FlowGraph::AddToGuardedFields(caller_graph_->guarded_fields(),
+                                      (*callee_graph->guarded_fields())[i]);
       }
 
       TRACE_INLINING(OS::Print("     Success\n"));
       return true;
     } else {
       Error& error = Error::Handle();
       error = isolate->object_store()->sticky_error();
       isolate->object_store()->clear_sticky_error();
       isolate->set_long_jump_base(base);
       isolate->set_deopt_id(prev_deopt_id);
@@ skipping 805 matching lines @@
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function().function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart