Revert "Extract interceptor calls from raw is-checks."

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 visitBailoutTarget(HBailoutTarget node);
   R visitBitAnd(HBitAnd node);
@@ skipping 2191 matching lines @@
 
 class HIs extends HInstruction {
   /// A check against a raw type: 'o is int', 'o is A'.
   static const int RAW_CHECK = 0;
   /// A check against a type with type arguments: 'o is List<int>', 'o is C<T>'.
   static const int COMPOUND_CHECK = 1;
   /// A check against a single type variable: 'o is T'.
   static const int VARIABLE_CHECK = 2;
 
   final DartType typeExpression;
+  final bool nullOk;
   final int kind;
 
-  HIs.direct(DartType typeExpression,
-             HInstruction expression)
-      : this.internal(typeExpression, [expression], RAW_CHECK);
-
-  HIs.raw(DartType typeExpression,
-          HInstruction expression,
-          HInterceptor interceptor)
-      : this.internal(typeExpression, [expression, interceptor], RAW_CHECK);
-
-  HIs.compound(DartType typeExpression,
-               HInstruction expression,
-               HInstruction call)
-      : this.internal(typeExpression, [expression, call], COMPOUND_CHECK);
-
-  HIs.variable(DartType typeExpression,
-               HInstruction expression,
-               HInstruction call)
-      : this.internal(typeExpression, [expression, call], VARIABLE_CHECK);
-
-  HIs.internal(this.typeExpression, List<HInstruction> inputs, this.kind)
-      : super(inputs) {
+  HIs(this.typeExpression, List<HInstruction> inputs, this.kind,
+      {this.nullOk: false}) : super(inputs) {
     assert(kind >= RAW_CHECK && kind <= VARIABLE_CHECK);
     setUseGvn();
     instructionType = HType.BOOLEAN;
   }
 
   HInstruction get expression => inputs[0];
 
-  HInstruction get interceptor {
-    assert(kind == RAW_CHECK);
-    return inputs.length > 1 ? inputs[1] : null;
-  }
-
   HInstruction get checkCall {
     assert(kind == VARIABLE_CHECK || kind == COMPOUND_CHECK);
     return inputs[1];
   }
 
   bool get isRawCheck => kind == RAW_CHECK;
   bool get isVariableCheck => kind == VARIABLE_CHECK;
   bool get isCompoundCheck => kind == COMPOUND_CHECK;
 
   accept(HVisitor visitor) => visitor.visitIs(this);
 
   toString() => "$expression is $typeExpression";
 
   int typeCode() => HInstruction.IS_TYPECODE;
 
   bool typeEquals(HInstruction other) => other is HIs;
 
   bool dataEquals(HIs other) {
     return typeExpression == other.typeExpression
+        && nullOk == other.nullOk
         && kind == other.kind;
   }
 }
 
 class HTypeConversion extends HCheck {
   final DartType typeExpression;
   final int kind;
   final Selector receiverTypeCheckSelector;
   final bool contextIsTypeArguments;
 
@@ skipping 453 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);
 }