Refactor types in ssa nodes.

lib/compiler/implementation/ssa/optimize.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 OptimizationPhase {
   String get name();
   void visitGraph(HGraph graph);
 }
 
 class SsaOptimizerTask extends CompilerTask {
@@ skipping 271 matching lines @@
         return new HEquals(target, node.left, node.right);
       }
     }
 
     // All other cases are dealt with by the [visitInvokeBinary].
     return visitInvokeBinary(node);
   }
 
   HInstruction visitTypeGuard(HTypeGuard node) {
     HInstruction value = node.guarded;
-    HType combinedType = value.propagatedType.combine(node.guardedType);
+    HType combinedType = value.propagatedType.intersect(node.guardedType);

[ngeoffray, 2012/04/23 10:19:21]

Please add a simple comment or example on why this is an intersection here.

[floitsch, 2012/04/24 15:25:18]

Good thing you made me do this. Should have been union.

     return (combinedType == value.propagatedType) ? value : node;
   }
 
   HInstruction visitIntegerCheck(HIntegerCheck node) {
     HInstruction value = node.value;
     return value.isInteger() ? value : node;
   }
 
   HInstruction visitIs(HIs node) {
     Type type = node.typeName;
@@ skipping 93 matching lines @@
     return check;
   }
 
   HIntegerCheck insertIntegerCheck(HInstruction node, HInstruction value) {
     HIntegerCheck check = new HIntegerCheck(value);
     node.block.addBefore(node, check);
     return check;
   }
 
   void visitIndex(HIndex node) {
-    if (!node.receiver.isStringOrArray()) return;
+    if (!node.receiver.isIndexablePrimitive()) return;
     HInstruction index = node.index;
     if (index is HBoundsCheck) return;
     if (!node.index.isInteger()) {
       index = insertIntegerCheck(node, index);
     }
     index = insertBoundsCheck(node, node.receiver, index);
     HIndex newInstruction = new HIndex(node.target, node.receiver, index);
     node.block.addBefore(node, newInstruction);
     node.block.rewrite(node, newInstruction);
     node.block.remove(node);
@@ skipping 399 matching lines @@
         }
       }
       if (!canBeMoved) continue;
 
       // This is safe because we are running after GVN.
       // TODO(ngeoffray): ensure GVN has been run.
       set_.add(current);
     }
   }
 }