Change TypeMask.base to be a ClassElement.

sdk/lib/_internal/compiler/implementation/world.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 dart2js;
 
 class World {
   final Compiler compiler;
   final FunctionSet allFunctions;
   final Set<Element> functionsCalledInLoop = new Set<Element>();
@@ skipping 134 matching lines @@
 
   bool hasAnyUserDefinedGetter(Selector selector) {
     return allFunctions.filter(selector).any((each) => each.isGetter());
   }
 
   bool hasAnyUserDefinedSetter(Selector selector) {
      return allFunctions.filter(selector).any((each) => each.isSetter());
   }
 
   // Returns whether a subclass of [superclass] implements [type].
-  bool hasAnySubclassThatImplements(ClassElement superclass, DartType type) {
+  bool hasAnySubclassThatImplements(ClassElement superclass,
+                                    ClassElement type) {
     Set<ClassElement> subclasses = typesImplementedBySubclassesOf(superclass);
     if (subclasses == null) return false;
-    return subclasses.contains(type.element);
+    return subclasses.contains(type);
   }
 
   // Returns whether a subclass of any mixin application of [cls] implements
   // [type].
-  bool hasAnySubclassOfMixinUseThatImplements(ClassElement cls, DartType type) {
+  bool hasAnySubclassOfMixinUseThatImplements(ClassElement cls,
+                                              ClassElement type) {
     Set<MixinApplicationElement> uses = mixinUses[cls];
     if (uses == null || uses.isEmpty) return false;
     return uses.any((use) => hasAnySubclassThatImplements(use, type));
   }
 
   // Returns whether a subclass of [superclass] mixes in [other].
   bool hasAnySubclassThatMixes(ClassElement superclass, ClassElement other) {
     Set<MixinApplicationElement> uses = mixinUses[other];
     return (uses != null)
         ? uses.any((each) => each.isSubclassOf(superclass))
@@ skipping 11 matching lines @@
     }
   }
 
   VariableElement locateSingleField(Selector selector) {
     Element result = locateSingleElement(selector);
     return (result != null && result.isField()) ? result : null;
   }
 
   Element locateSingleElement(Selector selector) {
     ti.TypeMask mask = selector.mask == null
-        ? new ti.TypeMask.subclass(compiler.objectClass.rawType)
+        ? new ti.TypeMask.subclass(compiler.objectClass)
         : selector.mask;
     return mask.locateSingleElement(selector, compiler);
   }
 
   bool hasSingleMatch(Selector selector) {
     Iterable<Element> targets = allFunctions.filter(selector);
     return targets.length == 1;
   }
 
   Iterable<ClassElement> locateNoSuchMethodHolders(Selector selector) {
@@ skipping 46 matching lines @@
           sideEffects.setDependsOnInstancePropertyStore();
         } else if (selector.isSetter()) {
           sideEffects.setChangesInstanceProperty();
         }
       }
       sideEffects.add(getSideEffectsOfElement(e));
     }
     return sideEffects;
   }
 }