Fix for issue #6259: also look for subclasses when checking if a typed selector applies to an eleme…

lib/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 Map<ClassElement, Set<ClassElement>> subtypes;
+  final Map<ClassElement, Set<ClassElement>> typesImplementedBySubclasses;
   final Set<ClassElement> classesNeedingRti;
   final Map<ClassElement, Set<ClassElement>> rtiDependencies;
   final FunctionSet userDefinedGetters;
   final FunctionSet userDefinedSetters;
 
   World(Compiler compiler)
       : subtypes = new Map<ClassElement, Set<ClassElement>>(),
+        typesImplementedBySubclasses =
+            new Map<ClassElement, Set<ClassElement>>(),
         userDefinedGetters = new FunctionSet(compiler),
         userDefinedSetters = new FunctionSet(compiler),
         classesNeedingRti = new Set<ClassElement>(),
         rtiDependencies = new Map<ClassElement, Set<ClassElement>>(),
         this.compiler = compiler;
 
   void populate() {
     void addSubtypes(ClassElement cls) {
       if (cls.resolutionState != STATE_DONE) {
         compiler.internalErrorOnElement(
             cls, 'Class "${cls.name.slowToString()}" is not resolved.');
       }
+
       for (DartType type in cls.allSupertypes) {
         Set<Element> subtypesOfCls =
           subtypes.putIfAbsent(type.element, () => new Set<ClassElement>());
         subtypesOfCls.add(cls);
       }
+
+      // Walk through the superclasses, and record the types
+      // implemented by that type on the superclasses.
+      DartType type = cls.supertype;
+      while (type != null) {
+        Set<Element> typesImplementedBySubclassesOfCls =
+          typesImplementedBySubclasses.putIfAbsent(
+              type.element, () => new Set<ClassElement>());
+        typesImplementedBySubclassesOfCls.addAll(cls.allSupertypes);
+        type = type.element.supertype;
+      }
     }
 
     compiler.resolverWorld.instantiatedClasses.forEach(addSubtypes);
 
     // Find the classes that need runtime type information. Such
     // classes are:
     // (1) used in a is check with type variables,
     // (2) dependencies of classes in (1),
     // (3) subclasses of (2) and (3).
 
@@ skipping 55 matching lines @@
   }
 
   bool hasAnyUserDefinedGetter(Selector selector) {
     return userDefinedGetters.hasAnyElementMatchingSelector(selector);
   }
 
   bool hasAnyUserDefinedSetter(Selector selector) {
     return userDefinedSetters.hasAnyElementMatchingSelector(selector);
   }
 
+  // Returnw whether a subclass of [superClass] implements [type].

[ahe, 2012/10/29 14:22:14]

// -> ///
Returnw -> Return
superclass is one word

[ngeoffray, 2012/10/29 14:37:53]

Done.

+  bool hasOneSubclassThatImplements(ClassElement superClass, Type type) {

[sra1, 2012/10/29 13:46:10]

By 'One' do you mean exactly 1, or 'Any'?
Perhaps just  'hasSubclassThatImplements'

[ngeoffray, 2012/10/29 14:05:38]

Good point. Changed 'One' to 'Any' to make it consistent with the other methods
above.

[ahe, 2012/10/29 14:22:14]

superclass is one word

[ngeoffray, 2012/10/29 14:37:53]

Done.

+    Set<ClassElement> typesImplementedBySubclasses =
+          typesImplementedBySubclasses[superClass];
+    if (typesImplementedBySubclasses == null) return false;
+    return typesImplementedBySubclasses.contains(type);
+  }
+
+
   void registerUsedElement(Element element) {
     if (element.isMember()) {
       if (element.isGetter()) {
         // We're collecting user-defined getters to let the codegen know which
         // field accesses might have side effects.
         recordUserDefinedGetter(element);
       } else if (element.isSetter()) {
         recordUserDefinedSetter(element);
       }
     }
@@ skipping 67 matching lines @@
   final SourceString name;
 
   MemberSet(SourceString this.name) : elements = new Set<Element>();
 
   void add(Element element) {
     elements.add(element);
   }
 
   bool get isEmpty => elements.isEmpty;
 }