Cleanups.

runtime/vm/flow_graph.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/flow_graph.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/growable_array.h"
 #include "vm/object_store.h"
 #include "vm/report.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, prune_dead_locals, true, "optimize dead locals away");
 DECLARE_FLAG(bool, reorder_basic_blocks);
 DECLARE_FLAG(bool, trace_optimization);
 DECLARE_FLAG(bool, verify_compiler);
 
 
-FlowGraph::FlowGraph(const FlowGraphBuilder& builder,
+FlowGraph::FlowGraph(ParsedFunction* parsed_function,
                      GraphEntryInstr* graph_entry,
                      intptr_t max_block_id)
   : isolate_(Isolate::Current()),
     parent_(),
     current_ssa_temp_index_(0),
     max_block_id_(max_block_id),
-    builder_(builder),
-    parsed_function_(*builder.parsed_function()),
-    num_copied_params_(builder.num_copied_params()),
-    num_non_copied_params_(builder.num_non_copied_params()),
+    parsed_function_(parsed_function),
+    num_copied_params_(parsed_function->num_copied_params()),
+    num_non_copied_params_(parsed_function->num_non_copied_params()),
     graph_entry_(graph_entry),
     preorder_(),
     postorder_(),
     reverse_postorder_(),
     optimized_block_order_(),
     constant_null_(NULL),
     constant_dead_(NULL),
     constant_empty_context_(NULL),
     block_effects_(NULL),
     licm_allowed_(true),
     loop_headers_(NULL),
     loop_invariant_loads_(NULL),
-    guarded_fields_(builder.guarded_fields()),
-    deferred_prefixes_(builder.deferred_prefixes()),
+    guarded_fields_(parsed_function->guarded_fields()),
+    deferred_prefixes_(parsed_function->deferred_prefixes()),
     captured_parameters_(
         new(isolate_) BitVector(isolate_, variable_count())) {
   DiscoverBlocks();
 }
 
 
 void FlowGraph::AddToGuardedFields(
     ZoneGrowableArray<const Field*>* array,
     const Field* field) {
   if ((field->guarded_cid() == kDynamicCid) ||
@@ skipping 25 matching lines @@
 
 
 bool FlowGraph::ShouldReorderBlocks(const Function& function,
                                     bool is_optimized) {
   return is_optimized && FLAG_reorder_basic_blocks && !function.is_intrinsic();
 }
 
 
 GrowableArray<BlockEntryInstr*>* FlowGraph::CodegenBlockOrder(
     bool is_optimized) {
-  return ShouldReorderBlocks(parsed_function().function(), is_optimized)
+  return ShouldReorderBlocks(parsed_function()->function(), is_optimized)
       ? &optimized_block_order_
       : &reverse_postorder_;
 }
 
 
 ConstantInstr* FlowGraph::GetConstant(const Object& object) {
   ConstantInstr* constant = constant_instr_pool_.Lookup(object);
   if (constant == NULL) {
     // Otherwise, allocate and add it to the pool.
     constant = new(isolate()) ConstantInstr(
@@ skipping 745 matching lines @@
       AddToInitialDefinitions(param);
       env.Add(param);
     }
   }
 
   // Initialize all locals in the renaming environment  For OSR, the locals have
   // already been handled as parameters.
   if (!IsCompiledForOsr()) {
     for (intptr_t i = parameter_count(); i < variable_count(); ++i) {
       if (i == CurrentContextEnvIndex()) {
-        if (parsed_function().function().IsClosureFunction()) {
+        if (parsed_function()->function().IsClosureFunction()) {
           CurrentContextInstr* context = new CurrentContextInstr();
           context->set_ssa_temp_index(alloc_ssa_temp_index());  // New SSA temp.
           AddToInitialDefinitions(context);
           env.Add(context);
         } else {
           env.Add(constant_empty_context());
         }
       } else {
         env.Add(constant_null());
       }
     }
   }
 
   if (entry->SuccessorCount() > 1) {
     // Functions with try-catch have a fixed area of stack slots reserved
     // so that all local variables are stored at a known location when
     // on entry to the catch.
     entry->set_fixed_slot_count(num_stack_locals() + num_copied_params());
   }
   RenameRecursive(entry, &env, live_phis, variable_liveness);
 }
 
 
 void FlowGraph::AttachEnvironment(Instruction* instr,
                                   GrowableArray<Definition*>* env) {
   Environment* deopt_env =
       Environment::From(isolate(),
                         *env,
                         num_non_copied_params_,
-                        &parsed_function_);
+                        parsed_function_);
   if (instr->IsClosureCall()) {
     deopt_env = deopt_env->DeepCopy(isolate(),
                                     deopt_env->Length() - instr->InputCount());
   }
   instr->SetEnvironment(deopt_env);
   for (Environment::DeepIterator it(deopt_env); !it.Done(); it.Advance()) {
     Value* use = it.CurrentValue();
     use->definition()->AddEnvUse(use);
   }
   if (instr->CanDeoptimize()) {
@@ skipping 483 matching lines @@
 }
 
 
 bool BlockEffects::IsSideEffectFreePath(BlockEntryInstr* from,
                                         BlockEntryInstr* to) const {
   return available_at_[to->postorder_number()]->Contains(
       from->postorder_number());
 }
 
 }  // namespace dart