New CL for https://chromiumcodereview.appspot.com/9784002/: Support non-speculative type propagatio…

lib/compiler/implementation/ssa/nodes.dart

 // Copyright (c) 2011, 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.
 
 interface HVisitor<R> {
   R visitAdd(HAdd node);
   R visitBitAnd(HBitAnd node);
   R visitBitNot(HBitNot node);
   R visitBitOr(HBitOr node);
   R visitBitXor(HBitXor node);
@@ skipping 739 matching lines @@
     if (flag === BOOLEAN.flag) return BOOLEAN;
     if (flag === INTEGER.flag) return INTEGER;
     if (flag === DOUBLE.flag) return DOUBLE;
     if (flag === STRING.flag) return STRING;
     if (flag === ARRAY.flag) return ARRAY;
     if (flag === NUMBER.flag) return NUMBER;
     if (flag === STRING_OR_ARRAY.flag) return STRING_OR_ARRAY;
     assert(false);
   }
 
+  String toString() {
+    if (isConflicting()) return 'conflicting';
+    if (isUnknown()) return 'unknown';
+    if (isBoolean()) return 'boolean';
+    if (isInteger()) return 'integer';
+    if (isDouble()) return 'double';
+    if (isString()) return 'string';
+    if (isArray()) return 'array';
+    if (isNumber()) return 'number';
+    if (isStringOrArray()) return 'string or array';
+    unreachable();
+  }
+
   HType combine(HType other) {
     if (isUnknown()) return other;
     if (other.isUnknown()) return this;
     return getTypeFromFlag(this.flag & other.flag);
   }
 }
 
 class HInstruction implements Hashable {
   final int id;
   static int idCounter;
@@ skipping 65 matching lines @@
     return candidateType;
   }
 
   HType computeDesiredInputType(HInstruction input) => HType.UNKNOWN;
 
   // Returns whether the instruction does produce the type it claims.
   // For most instructions, this returns false. A type guard will be
   // inserted to make sure the users get the right type in.
   bool hasExpectedType() => false;
 
-  // Re-compute and update the type of the instruction. Returns
-  // whether or not the type was changed.
-  bool updateType() {
-    if (type.isConflicting()) return false;
-    HType newType = computeType();
-    HType desiredType = computeDesiredType();
-    HType combined = newType.combine(desiredType);
-    if (combined.isKnown()) newType = combined;
-
-    bool changed = (type != newType);
-    if (type.isUnknown()) {
-      type = newType;
-      return changed;
-    } else if (changed) {
-      type = type.combine(newType);
-      return changed;
-    }
-    return false;
-  }
-
   bool isInBasicBlock() => block !== null;
 
   String inputsToString() {
     void addAsCommaSeparated(StringBuffer buffer, List<HInstruction> list) {
       for (int i = 0; i < list.length; i++) {
         if (i != 0) buffer.add(', ');
         buffer.add("@${list[i].id}");
       }
     }
 
@@ skipping 805 matching lines @@
   }
 
   void prepareGvn() {
     assert(!hasSideEffects());
   }
 
   toString() => 'literal: $constant';
   accept(HVisitor visitor) => visitor.visitConstant(this);
   HType computeType() => type;
 
-  // Literals have the type they have. It can't be changed.
-  bool updateType() => false;
-
   bool hasExpectedType() => true;
 
   bool isConstant() => true;
   bool isConstantBoolean() => constant.isBool();
   bool isConstantNull() => constant.isNull();
   bool isConstantNumber() => constant.isNum();
   bool isConstantString() => constant.isString();
 
   // Maybe avoid this if the literal is big?
   bool isCodeMotionInvariant() => true;
@@ skipping 90 matching lines @@
     return type;
   }
 
   bool hasExpectedType() {
     for (int i = 0; i < inputs.length; i++) {
       if (type.combine(inputs[i].type).isConflicting()) return false;
     }
     return true;
   }
 
-  void setInitialTypeForLoopPhi() {
-    assert(block.isLoopHeader());
-    assert(type.isUnknown());
-    type = inputs[0].type;
-  }
-
   bool isLogicalOperator() => logicalOperatorType != IS_NOT_LOGICAL_OPERATOR;
 
   String logicalOperator() {
     assert(isLogicalOperator());
     if (logicalOperatorType == IS_AND) return "&&";
     assert(logicalOperatorType == IS_OR);
     return "||";
   }
 
   toString() => 'phi';
@@ skipping 255 matching lines @@
 class HIfBlockInformation {
   final HIf branch;
   final SubGraph thenGraph;
   final SubGraph elseGraph;
   final HBasicBlock joinBlock;
   HIfBlockInformation(this.branch,
                       this.thenGraph,
                       this.elseGraph,
                       this.joinBlock);
 }