Cleanups.

runtime/vm/flow_graph.h

Index: runtime/vm/flow_graph.h
===================================================================
--- runtime/vm/flow_graph.h	(revision 42068)
+++ runtime/vm/flow_graph.h	(working copy)
@@ -83,26 +83,22 @@
 // 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_;
@@ -111,15 +107,15 @@
     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_);
   }
 
@@ -340,8 +336,7 @@
   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_;