Move handleLogicalAndOr to the SsaBranchBuilder.

lib/compiler/implementation/ssa/builder.dart

Index: lib/compiler/implementation/ssa/builder.dart
diff --git a/lib/compiler/implementation/ssa/builder.dart b/lib/compiler/implementation/ssa/builder.dart
index f106e1be2a4c4036bfc495df27093efa0c166098..a6ca20a4b62ea2a360437c6a89ce52c1cab935d6 100644
--- a/lib/compiler/implementation/ssa/builder.dart
+++ b/lib/compiler/implementation/ssa/builder.dart
@@ -1573,60 +1573,14 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
   }
 
   void visitLogicalAndOr(Send node, Operator op) {
-    handleLogicalAndOr(node,
-                       () { visit(node.receiver); },
-                       () { visit(node.argumentsNode); },
-                       isAnd: (const SourceString("&&") == op.source));
+    SsaBranchBuilder branchBuilder = new SsaBranchBuilder(this, node);
+    branchBuilder.handleLogicalAndOr(
+        () { visit(node.receiver); },
+        () { visit(node.argumentsNode); },
+        isAnd: (const SourceString("&&") == op.source));
   }
 
 
-  void handleLogicalAndOr(Node diagnosticNode,
-                          void left(), void right(), [bool isAnd = true]) {
-    // x && y is transformed into:
-    //   t0 = boolify(x);
-    //   if (t0) {
-    //     t1 = boolify(y);
-    //   } else {
-    //     t2 = t0;
-    //   }
-    //   result = phi(t1, false);
-    //
-    // x || y is transformed into:
-    //   t0 = boolify(x);
-    //   if (not(t0)) {
-    //     t1 = boolify(y);
-    //   } else {
-    //     t2 = t0;
-    //   }
-    //   result = phi(t1, true);
-    HInstruction boolifiedLeft;
-    HInstruction boolifiedRight;
-
-    void visitCondition() {
-      left();
-      boolifiedLeft = popBoolified();
-      HInstruction condition;
-      if (isAnd) {
-        condition = boolifiedLeft;
-      } else {
-        condition = new HNot(boolifiedLeft);
-        add(condition);
-      }
-      stack.add(condition);
-    }
-
-    void visitThen() {
-      right();
-      boolifiedRight = popBoolified();
-    }
-
-    handleIf(diagnosticNode, visitCondition, visitThen, null);
-    HPhi result = new HPhi.manyInputs(null,
-        <HInstruction>[boolifiedRight, graph.addConstantBool(!isAnd)]);
-    current.addPhi(result);
-    stack.add(result);
-  }
-
   void visitLogicalNot(Send node) {
     assert(node.argumentsNode is Prefix);
     visit(node.receiver);
@@ -3141,7 +3095,9 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       void right() {
         buildTests(tail);
       }
-      handleLogicalAndOr(remainingCases.head, left, right, isAnd: false);
+      SsaBranchBuilder branchBuilder =
+          new SsaBranchBuilder(this, remainingCases.head);
+      branchBuilder.handleLogicalAndOr(left, right, isAnd: false);
     }
 
     if (node.isDefaultCase) {
@@ -3500,6 +3456,52 @@ class SsaBranchBuilder {
     _handleDiamondBranch(visitCondition, visitThen, visitElse, true);
   }
 
+  void handleLogicalAndOr(void left(), void right(), [bool isAnd = true]) {
+    // x && y is transformed into:
+    //   t0 = boolify(x);
+    //   if (t0) {
+    //     t1 = boolify(y);
+    //   } else {
+    //     t2 = t0;
+    //   }
+    //   result = phi(t1, false);
+    //
+    // x || y is transformed into:
+    //   t0 = boolify(x);
+    //   if (not(t0)) {
+    //     t1 = boolify(y);
+    //   } else {
+    //     t2 = t0;
+    //   }
+    //   result = phi(t1, true);
+    HInstruction boolifiedLeft;
+    HInstruction boolifiedRight;
+
+    void visitCondition() {
+      left();
+      boolifiedLeft = builder.popBoolified();
+      HInstruction condition;
+      if (isAnd) {
+        condition = boolifiedLeft;
+      } else {
+        condition = new HNot(boolifiedLeft);
+        builder.add(condition);
+      }

[Lasse Reichstein Nielsen, 2012/07/12 07:18:26]

Could be shorter by using the stack more:
void visitCondition() {
 left();
 boolifiedLeft = builder.popBoolified();
 builder.stack.add(boolifiedLeft);
 if (isAnd) {
   builder.push(new HNot(builder.pop());
 }
}
 

[floitsch, 2012/07/12 09:23:30]

Agreed, but in this CL I'm not going to change any code (unless necessary for it
to work in the new location).

+      builder.stack.add(condition);
+    }
+
+    void visitThen() {
+      right();
+      boolifiedRight = builder.popBoolified();
+    }
+
+    handleIf(visitCondition, visitThen, null);
+    HPhi result = new HPhi.manyInputs(null,
+        <HInstruction>[boolifiedRight, builder.graph.addConstantBool(!isAnd)]);
+    builder.current.addPhi(result);
+    builder.stack.add(result);
+  }
+
   void _handleDiamondBranch(void visitCondition(),
                             void visitThen(),
                             void visitElse(),