Cleanups.

runtime/vm/flow_graph.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_H_
 #define VM_FLOW_GRAPH_H_
 
 #include "vm/bit_vector.h"
 #include "vm/growable_array.h"
 #include "vm/hash_map.h"
@@ skipping 65 matching lines @@
 
   static inline bool IsKeyEqual(Pair kv, Key key) {
     return kv->value().raw() == key.raw();
   }
 };
 
 
 // Class to encapsulate the construction and manipulation of the flow graph.
 class FlowGraph : public ZoneAllocated {
  public:
-  FlowGraph(const FlowGraphBuilder& builder,
+  FlowGraph(ParsedFunction* parsed_function,
             GraphEntryInstr* graph_entry,
             intptr_t max_block_id);
 
-  const FlowGraphBuilder& builder() const {
-    return builder_;
-  }
-
   // Function properties.
-  ParsedFunction& parsed_function() const {
+  ParsedFunction* parsed_function() const {
     return parsed_function_;
   }
   intptr_t parameter_count() const {
     return num_copied_params_ + num_non_copied_params_;
   }
   intptr_t variable_count() const {
-    return parameter_count() + num_stack_locals();
+    return parameter_count() + parsed_function_->num_stack_locals();
   }
   intptr_t num_stack_locals() const {
-    return parsed_function().num_stack_locals();
+    return parsed_function_->num_stack_locals();
   }
   intptr_t num_copied_params() const {
     return num_copied_params_;
   }
   intptr_t num_non_copied_params() const {
     return num_non_copied_params_;
   }
   bool IsIrregexpFunction() const {
-    return parsed_function().function().IsIrregexpFunction();
+    return parsed_function()->function().IsIrregexpFunction();
   }
 
   LocalVariable* CurrentContextVar() const {
-    return parsed_function().current_context_var();
+    return parsed_function()->current_context_var();
   }
 
   intptr_t CurrentContextEnvIndex() const {
-    return parsed_function().current_context_var()->BitIndexIn(
+    return parsed_function()->current_context_var()->BitIndexIn(
         num_non_copied_params_);
   }
 
   // Flow graph orders.
   const GrowableArray<BlockEntryInstr*>& preorder() const {
     return preorder_;
   }
   const GrowableArray<BlockEntryInstr*>& postorder() const {
     return postorder_;
   }
@@ skipping 200 matching lines @@
 
   // DiscoverBlocks computes parent_ and assigned_vars_ which are then used
   // if/when computing SSA.
   GrowableArray<intptr_t> parent_;
   GrowableArray<BitVector*> assigned_vars_;
 
   intptr_t current_ssa_temp_index_;
   intptr_t max_block_id_;
 
   // Flow graph fields.
-  const FlowGraphBuilder& builder_;
-  ParsedFunction& parsed_function_;
+  ParsedFunction* parsed_function_;
   const intptr_t num_copied_params_;
   const intptr_t num_non_copied_params_;
   GraphEntryInstr* graph_entry_;
   GrowableArray<BlockEntryInstr*> preorder_;
   GrowableArray<BlockEntryInstr*> postorder_;
   GrowableArray<BlockEntryInstr*> reverse_postorder_;
   GrowableArray<BlockEntryInstr*> optimized_block_order_;
   ConstantInstr* constant_null_;
   ConstantInstr* constant_dead_;
   ConstantInstr* constant_empty_context_;
@@ skipping 155 matching lines @@
 
  private:
   GrowableArray<Definition*> defs_;
   BitVector* contains_vector_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_