Add dependencies to type variables used in the super type declaration, but do

pkg/compiler/lib/src/deferred_load.dart

 // Copyright (c) 2014, 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.
 
 library deferred_load;
 
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'constants/expressions.dart' show ConstantExpression;
@@ skipping 301 matching lines @@
           collectTypeDependencies(argumentType);
         }
         for (ResolutionDartType argumentType in type.namedParameterTypes) {
           collectTypeDependencies(argumentType);
         }
         collectTypeDependencies(type.returnType);
       } else if (type is ResolutionTypedefType) {
         elements.add(type.element);
         collectTypeDependencies(type.unaliased);
       } else if (type is ResolutionInterfaceType) {
-        if (elements.add(type.element)) {
-          collectTypeDependencies(type.element.supertype);
-        }
+        elements.add(type.element);
       }
     }
 
     /// Collects all direct dependencies of [element].
     ///
     /// The collected dependent elements and constants are are added to
     /// [elements] and [constants] respectively.
     void collectDependencies(Element element) {
       // TODO(johnniwinther): Remove this when [AbstractFieldElement] has been
       // removed.
@@ skipping 114 matching lines @@
       // extra dependencies due to mirrors.
       void addLiveInstanceMember(_, _element) {
         MemberElement element = _element;
         if (!compiler.resolutionWorldBuilder.isMemberUsed(element)) return;
         if (!isMirrorUsage && !element.isInstanceMember) return;
         elements.add(element);
         collectDependencies(element);
       }
 
       ClassElement cls = element.declaration;
-      cls.implementation.forEachMember(addLiveInstanceMember);
-      for (ResolutionInterfaceType type in cls.implementation.allSupertypes) {
+      ClassElement implementation = cls.implementation;
+      implementation.forEachMember(addLiveInstanceMember);
+      var supertype = implementation.supertype;
+      if (supertype is GenericType) {
+        supertype.typeArguments.forEach(collectTypeDependencies);
+      }
+      for (ResolutionInterfaceType type in implementation.allSupertypes) {
         elements.add(type.element.implementation);

[sra1, 2017/08/11 21:55:46]

I think we need types from all supertypes to ensure they are available for the
$asX functions.

[Siggi Cherem (dart-lang), 2017/08/11 22:08:15]

Done. Also added a test with an `is` check. We should be good now.

       }
-      elements.add(cls.implementation);
+      elements.add(implementation);
     } else if (Elements.isStaticOrTopLevel(element) || element.isConstructor) {
       elements.add(element);
       collectDependencies(element);
     }
     if (element.isGenerativeConstructor) {
       // When instantiating a class, we record a reference to the
       // constructor, not the class itself.  We must add all the
       // instance members of the constructor's class.
       ClassElement implementation = element.enclosingClass.implementation;
       _collectAllElementsAndConstantsResolvedFrom(
@@ skipping 650 matching lines @@
 
   bool operator ==(other) {
     if (other is! _DeclaredDeferredImport) return false;
     return declaration == other.declaration;
   }
 
   int get hashCode => declaration.hashCode * 17;
 
   String toString() => '$declaration';
 }