Refactored FlowGraphBuilder into a separate FlowGraph representation.

runtime/vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
 #include "vm/intermediate_language.h"
 
 namespace dart {
 
+class FlowGraph;
 class Instruction;
 class ParsedFunction;
 
 // Build a flow graph from a parsed function's AST.
 class FlowGraphBuilder: public ValueObject {
  public:
   explicit FlowGraphBuilder(const ParsedFunction& parsed_function);
 
-  void BuildGraph(bool for_optimized, bool use_ssa);
+  FlowGraph* BuildGraph();
 
   const ParsedFunction& parsed_function() const { return parsed_function_; }
 
-  const GrowableArray<BlockEntryInstr*>& postorder_block_entries() const {
-    return postorder_block_entries_;
-  }
-
   void Bailout(const char* reason);
 
   void set_context_level(intptr_t value) { context_level_ = value; }
   intptr_t context_level() const { return context_level_; }
 
   // Each try in this function gets its own try index.
   intptr_t AllocateTryIndex() { return ++last_used_try_index_; }
 
   // Manage the currently active try index.
   void set_try_index(intptr_t value) { try_index_ = value; }
   intptr_t try_index() const { return try_index_; }
 
   void AddCatchEntry(TargetEntryInstr* entry);
 
-  intptr_t current_ssa_temp_index() const {
-    return current_ssa_temp_index_;
+  intptr_t copied_parameter_count() const {
+    return copied_parameter_count_;
   }
-
-  intptr_t alloc_ssa_temp_index() {
-    return current_ssa_temp_index_++;
+  intptr_t non_copied_parameter_count() const {
+    return non_copied_parameter_count_;
   }
-
-  intptr_t copied_parameter_count() const { return copied_parameter_count_; }
+  intptr_t stack_local_count() const {
+    return stack_local_count_;
+  }
 
  private:
   intptr_t parameter_count() const {
     return copied_parameter_count_ + non_copied_parameter_count_;
   }
   intptr_t variable_count() const {
     return parameter_count() + stack_local_count_;
   }
 
-  void ComputeDominators(GrowableArray<BlockEntryInstr*>* preorder,
-                         GrowableArray<intptr_t>* parent,
-                         GrowableArray<BitVector*>* dominance_frontier);
-
-  void CompressPath(intptr_t start_index,
-                    intptr_t current_index,
-                    GrowableArray<intptr_t>* parent,
-                    GrowableArray<intptr_t>* label);
-
-  void Rename(GrowableArray<PhiInstr*>* live_phis);
-  void RenameRecursive(BlockEntryInstr* block_entry,
-                       GrowableArray<Value*>* env,
-                       GrowableArray<PhiInstr*>* live_phis);
-
-  void InsertPhis(const GrowableArray<BlockEntryInstr*>& preorder,
-                  const GrowableArray<BitVector*>& assigned_vars,
-                  const GrowableArray<BitVector*>& dom_frontier);
-
-  void MarkLivePhis(GrowableArray<PhiInstr*>* live_phis);
-
   const ParsedFunction& parsed_function_;
 
   const intptr_t copied_parameter_count_;
   const intptr_t non_copied_parameter_count_;
   const intptr_t stack_local_count_;  // Does not include any parameters.
 
-  GrowableArray<BlockEntryInstr*> preorder_block_entries_;
-  GrowableArray<BlockEntryInstr*> postorder_block_entries_;
   intptr_t context_level_;
   intptr_t last_used_try_index_;
   intptr_t try_index_;
   GraphEntryInstr* graph_entry_;
-  intptr_t current_ssa_temp_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FlowGraphBuilder);
 };
 
 
 class TestGraphVisitor;
 
 // Translate an AstNode to a control-flow graph fragment for its effects
 // (e.g., a statement or an expression in an effect context).  Implements a
 // function from an AstNode and next temporary index to a graph fragment
@@ skipping 270 matching lines @@
   // Output parameters.
   TargetEntryInstr** true_successor_address_;
   TargetEntryInstr** false_successor_address_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_