Many type fixes.

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 487 matching lines @@
     instruction.notifyAddedToBlock(this);
   }
 
   void addPhi(HPhi phi) {
     phis.addAfter(phis.last, phi);
     phi.notifyAddedToBlock(this);
   }
 
   void removePhi(HPhi phi) {
     phis.remove(phi);
-    phi.notifyRemovedFromBlock(this);
+    assert(phi.block == this);
+    phi.notifyRemovedFromBlock();
   }
 
   void addAfter(HInstruction cursor, HInstruction instruction) {
     assert(cursor is !HPhi);
     assert(instruction is !HPhi);
     assert(isOpen() || isClosed());
     super.addAfter(cursor, instruction);
     instruction.notifyAddedToBlock(this);
   }
 
   void addBefore(HInstruction cursor, HInstruction instruction) {
     assert(cursor is !HPhi);
     assert(instruction is !HPhi);
     assert(isOpen() || isClosed());
     super.addBefore(cursor, instruction);
     instruction.notifyAddedToBlock(this);
   }
 
   void remove(HInstruction instruction) {
     assert(isOpen() || isClosed());
     assert(instruction is !HPhi);
     super.remove(instruction);
-    instruction.notifyRemovedFromBlock(this);
+    assert(instruction.block == this);
+    instruction.notifyRemovedFromBlock();
   }
 
   void addSuccessor(HBasicBlock block) {
     // Forward branches are only allowed to new blocks.
     assert(isClosed() && (block.isNew() || block.id < id));
     if (successors.isEmpty()) {
       successors = [block];
     } else {
       successors.add(block);
     }
@@ skipping 392 matching lines @@
   }
 
   // These methods should be overwritten by instructions that
   // participate in global value numbering.
   int typeCode() => -1;
   bool typeEquals(HInstruction other) => false;
   bool dataEquals(HInstruction other) => false;
 
   abstract accept(HVisitor visitor);
 
-  void notifyAddedToBlock(HBasicBlock block) {
+  void notifyAddedToBlock(HBasicBlock targetBlock) {
     assert(!isInBasicBlock());
-    assert(this.block === null);
+    assert(block === null);
     // Add [this] to the inputs' uses.
     for (int i = 0; i < inputs.length; i++) {
       assert(inputs[i].isInBasicBlock());
       inputs[i].usedBy.add(this);
     }
-    this.block = block;
+    block = targetBlock;
     assert(isValid());
   }
 
-  void notifyRemovedFromBlock(HBasicBlock block) {
+  void notifyRemovedFromBlock() {
     assert(isInBasicBlock());
     assert(usedBy.isEmpty());
-    assert(this.block === block);
 
     // Remove [this] from the inputs' uses.
     for (int i = 0; i < inputs.length; i++) {
       List inputUsedBy = inputs[i].usedBy;
       for (int j = 0; j < inputUsedBy.length; j++) {
         if (inputUsedBy[j] === this) {
           inputUsedBy[j] = inputUsedBy[inputUsedBy.length - 1];
           inputUsedBy.removeLast();
           break;
         }
@@ skipping 1129 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);
 }