Revert "Collect the types used in is-checks in the resolver phase."

lib/compiler/implementation/ssa/codegen.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.
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
   SsaCodeGeneratorTask(JavaScriptBackend backend)
       : this.backend = backend,
@@ skipping 2198 matching lines @@
 
   void checkFixedArray(HInstruction input) {
     checkFieldExists(input, 'fixed\$length');
   }
 
   void checkNull(HInstruction input) {
     use(input);
     push(new js.Binary('==', pop(), new js.LiteralNull()));
   }
 
-  void checkFunction(HInstruction input, DartType type) {
+  void checkFunction(HInstruction input, Element element) {
     checkTypeOf(input, '===', 'function');
     js.Expression functionTest = pop();
     checkObject(input, '===');
     js.Expression objectTest = pop();
-    checkType(input, type);
+    checkType(input, element);
     push(new js.Binary('||',
                        functionTest,
                        new js.Binary('&&', objectTest, pop())));
   }
 
-  void checkType(HInstruction input, DartType type, [bool negative = false]) {
-    Element element = type.element;
+  void checkType(HInstruction input, Element element, [bool negative = false]) {
+    world.registerIsCheck(element);
     use(input);
     js.PropertyAccess field =
         new js.PropertyAccess.field(pop(), compiler.namer.operatorIs(element));
     if (backend.emitter.nativeEmitter.requiresNativeIsCheck(element)) {
       push(new js.Call(field, <js.Expression>[]));
       if (negative) push(new js.Prefix('!', pop()));
     } else {
       // We always negate at least once so that the result is boolified.
       push(new js.Prefix('!', field));
       // If the result is not negated, put another '!' in front.
       if (!negative) push(new js.Prefix('!', pop()));
     }
   }
 
-  void handleStringSupertypeCheck(HInstruction input, DartType type) {
+  void handleStringSupertypeCheck(HInstruction input, Element element) {
     // Make sure List and String don't share supertypes, otherwise we
     // would need to check for List too.
-    assert(type.element !== compiler.listClass
-           && !Elements.isListSupertype(type.element, compiler));
+    assert(element !== compiler.listClass
+           && !Elements.isListSupertype(element, compiler));
     checkString(input, '===');
     js.Expression stringTest = pop();
     checkObject(input, '===');
     js.Expression objectTest = pop();
-    checkType(input, type);
+    checkType(input, element);
     push(new js.Binary('||',
                        stringTest,
                        new js.Binary('&&', objectTest, pop())));
   }
 
-  void handleListOrSupertypeCheck(HInstruction input, DartType type) {
+  void handleListOrSupertypeCheck(HInstruction input, Element element) {
     // Make sure List and String don't share supertypes, otherwise we
     // would need to check for String too.
-    assert(type.element !== compiler.stringClass
-           && !Elements.isStringSupertype(type.element, compiler));
+    assert(element !== compiler.stringClass
+           && !Elements.isStringSupertype(element, compiler));
     checkObject(input, '===');
     js.Expression objectTest = pop();
     checkArray(input, '===');
     js.Expression arrayTest = pop();
-    checkType(input, type);
+    checkType(input, element);
     push(new js.Binary('&&',
                        objectTest,
                        new js.Binary('||', arrayTest, pop())));
   }
 
   void visitIs(HIs node) {
     DartType type = node.typeExpression;
     Element element = type.element;
     if (element.kind === ElementKind.TYPE_VARIABLE) {
       compiler.unimplemented("visitIs for type variables", instruction: node);
@@ skipping 14 matching lines @@
     } else if (element == compiler.doubleClass) {
       checkDouble(input, '===');
       attachLocationToLast(node);
     } else if (element == compiler.numClass) {
       checkNum(input, '===');
       attachLocationToLast(node);
     } else if (element == compiler.boolClass) {
       checkBool(input, '===');
       attachLocationToLast(node);
     } else if (element == compiler.functionClass) {
-      checkFunction(input, type);
+      checkFunction(input, element);
       attachLocationToLast(node);
     } else if (element == compiler.intClass) {
       checkNum(input, '===');
       js.Expression numTest = pop();
       checkInt(input, '===');
       push(new js.Binary('&&', numTest, pop()), node);
     } else if (Elements.isStringSupertype(element, compiler)) {
-      handleStringSupertypeCheck(input, type);
+      handleStringSupertypeCheck(input, element);
       attachLocationToLast(node);
     } else if (element === compiler.listClass
                || Elements.isListSupertype(element, compiler)) {
-      handleListOrSupertypeCheck(input, type);
+      handleListOrSupertypeCheck(input, element);
       attachLocationToLast(node);
     } else if (types[input].canBePrimitive() || types[input].canBeNull()) {
       checkObject(input, '===');
       js.Expression objectTest = pop();
-      checkType(input, type);
+      checkType(input, element);
       push(new js.Binary('&&', objectTest, pop()), node);
     } else {
-      checkType(input, type);
+      checkType(input, element);
       attachLocationToLast(node);
     }
     if (node.hasTypeInfo()) {
       InterfaceType interfaceType = type;
       ClassElement cls = type.element;
       Link<DartType> arguments = interfaceType.arguments;
       js.Expression result = pop();
       for (TypeVariableType typeVariable in cls.typeVariables) {
         use(node.typeInfoCall);
         // TODO(johnniwinther): Retrieve the type name properly and not through
@@ skipping 39 matching lines @@
           const SourceString("listSuperTypeCast"),
       "callTypeCheck":
           const SourceString("callTypeCast"),
       "propertyTypeCheck":
           const SourceString("propertyTypeCast")
     };
 
     if (node.isChecked) {
       DartType type = node.type.computeType(compiler);
       Element element = type.element;
-      world.registerIsCheck(type);
+      world.registerIsCheck(element);
 
       if (node.isArgumentTypeCheck) {
         if (element == compiler.intClass) {
           checkInt(node.checkedInput, '!==');
         } else {
           assert(element == compiler.numClass);
           checkNum(node.checkedInput, '!==');
         }
         js.Expression test = pop();
         js.Block oldContainer = currentContainer;
@@ skipping 84 matching lines @@
       assert(!element.isField());
       bailoutTarget = new js.VariableUse(namer.isolateBailoutAccess(element));
     }
     js.Call call = new js.Call(bailoutTarget, arguments);
     attachLocation(call, guard);
     return new js.Return(call);
   }
 
   void visitTypeGuard(HTypeGuard node) {
     HInstruction input = node.guarded;
-    DartType indexingBehavior =
-        compiler.jsIndexingBehaviorInterface.computeType(compiler);
+    Element indexingBehavior = compiler.jsIndexingBehaviorInterface;
     if (node.isInteger(types)) {
       // if (input is !int) bailout
       checkInt(input, '!==');
       js.Statement then = bailout(node, 'Not an integer');
       pushStatement(new js.If.noElse(pop(), then), node);
     } else if (node.isNumber(types)) {
       // if (input is !num) bailout
       checkNum(input, '!==');
       js.Statement then = bailout(node, 'Not a number');
       pushStatement(new js.If.noElse(pop(), then), node);
@@ skipping 433 matching lines @@
   if (leftType.canBeNull() && rightType.canBeNull()) {
     if (left.isConstantNull() || right.isConstantNull() ||
         (leftType.isPrimitive() && leftType == rightType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }