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

runtime/vm/compiler.cc

 // Copyright (c) 2012, 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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 252 matching lines @@
   bool done = false;
   // volatile because the variable may be clobbered by a longjmp.
   volatile bool use_far_branches = false;
   while (!done) {
     const intptr_t prev_deopt_id = isolate->deopt_id();
     isolate->set_deopt_id(0);
     LongJump* old_base = isolate->long_jump_base();
     LongJump bailout_jump;
     isolate->set_long_jump_base(&bailout_jump);
     if (setjmp(*bailout_jump.Set()) == 0) {
-      FlowGraphBuilder* builder = NULL;
       FlowGraph* flow_graph = NULL;
-      GrowableArray<const Field*> guarded_fields;
       // TimerScope needs an isolate to be properly terminated in case of a
       // LongJump.
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphbuilder_timer,
                          isolate);
         Array& ic_data_array = Array::Handle();
         if (optimized) {
           ASSERT(function.HasCode());
           // Extract type feedback before the graph is built, as the graph
           // builder uses it to attach it to nodes.
           ASSERT(function.deoptimization_counter() <
                  FLAG_deoptimization_counter_threshold);
           const Code& unoptimized_code =
               Code::Handle(function.unoptimized_code());
           ic_data_array = unoptimized_code.ExtractTypeFeedbackArray();
         }
 
         // Build the flow graph.
-        builder = new FlowGraphBuilder(parsed_function,
-                                       ic_data_array,
-                                       NULL,  // NULL = not inlining.
-                                       &guarded_fields,
-                                       osr_id);
-        flow_graph = builder->BuildGraph();
+        FlowGraphBuilder builder(parsed_function,
+                                 ic_data_array,
+                                 NULL,  // NULL = not inlining.
+                                 osr_id);
+        flow_graph = builder.BuildGraph();
       }
 
       if (FLAG_print_flow_graph ||
           (optimized && FLAG_print_flow_graph_optimized)) {
         if (osr_id == Isolate::kNoDeoptId) {
           FlowGraphPrinter::PrintGraph("Before Optimizations", flow_graph);
         } else {
           FlowGraphPrinter::PrintGraph("For OSR", flow_graph);
         }
       }
@@ skipping 233 matching lines @@
         if (optimized) {
           if (osr_id == Isolate::kNoDeoptId) {
             CodePatcher::PatchEntry(Code::Handle(function.CurrentCode()));
             if (FLAG_trace_compiler) {
               OS::Print("--> patching entry %#" Px "\n",
                   Code::Handle(function.unoptimized_code()).EntryPoint());
             }
           }
           function.SetCode(code);
 
-          for (intptr_t i = 0; i < guarded_fields.length(); i++) {
-            const Field& field = *guarded_fields[i];
-            field.RegisterDependentCode(code);
+          for (intptr_t i = 0;
+               i < flow_graph->guarded_fields()->length();
+               i++) {
+            const Field* field = (*flow_graph->guarded_fields())[i];
+            field->RegisterDependentCode(code);
           }
         } else {
           function.set_unoptimized_code(code);
           function.SetCode(code);
           ASSERT(CodePatcher::CodeIsPatchable(code));
         }
       }
       is_compiled = true;
       done = true;
     } else {
@@ skipping 358 matching lines @@
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart