Refactored FlowGraphBuilder into a separate FlowGraph representation.

runtime/vm/flow_graph_allocator.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_ALLOCATOR_H_
 #define VM_FLOW_GRAPH_ALLOCATOR_H_
 
 #include "vm/growable_array.h"
 #include "vm/intermediate_language.h"
 
 namespace dart {
 
 class AllocationFinger;
 class BlockInfo;
-class FlowGraphBuilder;
+class FlowGraph;
 class LiveRange;
 class UseInterval;
 class UsePosition;
 
 class FlowGraphAllocator : public ValueObject {
  public:
-  FlowGraphAllocator(const GrowableArray<BlockEntryInstr*>& block_order,
-                     FlowGraphBuilder* builder);
+  explicit FlowGraphAllocator(FlowGraph* flow_graph);
 
   void AllocateRegisters();
 
   // Build live-in and live-out sets for each block.
   void AnalyzeLiveness();
 
   // Map a virtual register number to its live range.
   LiveRange* GetLiveRange(intptr_t vreg);
 
  private:
@@ skipping 133 matching lines @@
   void SpillBetween(LiveRange* range, intptr_t from, intptr_t to);
 
   // Mark the live range as a live object pointer at all safepoints
   // contained in the range.
   void MarkAsObjectAtSafepoints(LiveRange* range);
 
   MoveOperands* AddMoveAt(intptr_t pos, Location to, Location from);
 
   void PrintLiveRanges();
 
   // TODO(vegorov): this field is used only to call Bailout. Remove when

[Kevin Millikin (Google), 2012/08/16 08:09:57]

I don't think the TODO comment is accurate anymore (flow_graph_ is used for more
than calling Bailout).  The comment can be deleted.

[zerny-google, 2012/08/16 11:52:27]

Done.

   // all bailouts are gone.
-  FlowGraphBuilder* builder_;
+  FlowGraph* flow_graph_;
 
   const GrowableArray<BlockEntryInstr*>& block_order_;
   const GrowableArray<BlockEntryInstr*>& postorder_;
 
   // Mapping between lifetime positions and instructions.
   GrowableArray<Instruction*> instructions_;
 
   // Mapping between lifetime positions and blocks containing them.
   GrowableArray<BlockInfo*> block_info_;
 
@@ skipping 320 matching lines @@
 
   AllocationFinger finger_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveRange);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_ALLOCATOR_H_