Allow test context to have multiple true and false branch slots.

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"
@@ skipping 325 matching lines @@
 // or else control flow has both true and false successors.
 //
 // The cis and token_pos are used in checked mode to verify that the
 // condition of the test is of type bool.
 class TestGraphVisitor : public ValueGraphVisitor {
  public:
   TestGraphVisitor(FlowGraphBuilder* owner,
                    intptr_t temp_index,
                    intptr_t condition_token_pos)
       : ValueGraphVisitor(owner, temp_index),
-        true_successor_address_(NULL),
-        false_successor_address_(NULL),
+        true_successor_addresses_(1),
+        false_successor_addresses_(1),
         condition_token_pos_(condition_token_pos) { }
 
-  TargetEntryInstr** true_successor_address() const {
-    ASSERT(true_successor_address_ != NULL);
-    return true_successor_address_;
-  }
-  TargetEntryInstr** false_successor_address() const {
-    ASSERT(false_successor_address_ != NULL);
-    return false_successor_address_;
-  }
+  void IfFalseGoto(JoinEntryInstr* join) const;
+  void IfTrueGoto(JoinEntryInstr* join) const;
+
+  BlockEntryInstr* CreateTrueSuccessor() const;
+  BlockEntryInstr* CreateFalseSuccessor() const;
+
+  virtual void VisitBinaryOpNode(BinaryOpNode* node);
 
   intptr_t condition_token_pos() const { return condition_token_pos_; }
 
  private:
   // Construct and concatenate a Branch instruction to this graph fragment.
   // Closes the fragment and sets the output parameters.
   virtual void ReturnValue(Value* value);
 
   // Either merges the computation into BranchInstr (Comparison, BooleanNegate)
   // or adds a Bind instruction to the graph and returns its temporary value.
   virtual void ReturnComputation(Computation* computation);
 
   void MergeBranchWithComparison(ComparisonComp* comp);
   void MergeBranchWithNegate(BooleanNegateComp* comp);
 
+  BlockEntryInstr* CreateSuccessorFor(
+    const GrowableArray<TargetEntryInstr**>& branches) const;
+
+  void ConnectBranchesTo(
+    const GrowableArray<TargetEntryInstr**>& branches,
+    JoinEntryInstr* join) const;
+
   // Output parameters.
-  TargetEntryInstr** true_successor_address_;
-  TargetEntryInstr** false_successor_address_;
+  GrowableArray<TargetEntryInstr**> true_successor_addresses_;
+  GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_