Revert "Separate HTypeConversion checked type from output type."

sdk/lib/_internal/compiler/implementation/ssa/nodes.dart

 // 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.
 
 part of ssa;
 
 abstract class HVisitor<R> {
   R visitAdd(HAdd node);
   R visitBitAnd(HBitAnd node);
   R visitBitNot(HBitNot node);
@@ skipping 2233 matching lines @@
     return typeExpression == other.typeExpression
         && kind == other.kind;
   }
 }
 
 class HTypeConversion extends HCheck {
   final DartType typeExpression;
   final int kind;
   final Selector receiverTypeCheckSelector;
   final bool contextIsTypeArguments;
-  HType checkedType;  // Not final because we refine it.
 
   static const int CHECKED_MODE_CHECK = 0;
   static const int ARGUMENT_TYPE_CHECK = 1;
   static const int CAST_TYPE_CHECK = 2;
   static const int BOOLEAN_CONVERSION_CHECK = 3;
   static const int RECEIVER_TYPE_CHECK = 4;
 
   HTypeConversion(this.typeExpression, this.kind,
                   HType type, HInstruction input,
                   [this.receiverTypeCheckSelector])
       : contextIsTypeArguments = false,
-        checkedType = type,
         super(<HInstruction>[input]) {
     assert(!isReceiverTypeCheck || receiverTypeCheckSelector != null);
     assert(typeExpression == null ||
            typeExpression.kind != TypeKind.TYPEDEF);
     sourceElement = input.sourceElement;
     instructionType = type;
   }
 
   HTypeConversion.withTypeRepresentation(this.typeExpression, this.kind,
                                          HType type, HInstruction input,
                                          HInstruction typeRepresentation)
       : contextIsTypeArguments = false,
-        checkedType = type,
         super(<HInstruction>[input, typeRepresentation]),
         receiverTypeCheckSelector = null {
     assert(typeExpression.kind != TypeKind.TYPEDEF);
     sourceElement = input.sourceElement;
     instructionType = type;
   }
 
   HTypeConversion.withContext(this.typeExpression, this.kind,
                               HType type, HInstruction input,
                               HInstruction context,
                               {bool this.contextIsTypeArguments})
       : super(<HInstruction>[input, context]),
-        checkedType = type,
         receiverTypeCheckSelector = null {
     assert(typeExpression.kind != TypeKind.TYPEDEF);
     sourceElement = input.sourceElement;
     instructionType = type;
   }
 
   bool get hasTypeRepresentation {
     return typeExpression.kind == TypeKind.INTERFACE && inputs.length > 1;
   }
   HInstruction get typeRepresentation => inputs[1];
@@ skipping 22 matching lines @@
   bool isJsStatement() => isControlFlow();
   bool isControlFlow() => isArgumentTypeCheck || isReceiverTypeCheck;
 
   int typeCode() => HInstruction.TYPE_CONVERSION_TYPECODE;
   bool typeEquals(HInstruction other) => other is HTypeConversion;
   bool isCodeMotionInvariant() => false;
 
   bool dataEquals(HTypeConversion other) {
     return kind == other.kind
         && typeExpression == other.typeExpression
-        && checkedType == other.checkedType;
+        && instructionType == other.instructionType;
   }
 }
 
 /// The [HTypeKnown] instruction marks a value with a refined type.
 class HTypeKnown extends HCheck {
   HType knownType;
   HTypeKnown(HType this.knownType, HInstruction input)
       : super(<HInstruction>[input]) {
     instructionType = knownType;
   }
@@ skipping 389 matching lines @@
   HBasicBlock get start => expression.start;
   HBasicBlock get end {
     // We don't create a switch block if there are no cases.
     assert(!statements.isEmpty);
     return statements.last.end;
   }
 
   bool accept(HStatementInformationVisitor visitor) =>
       visitor.visitSwitchInfo(this);
 }