Dart2js deferred loading. Follow types of functions when calculating dependencies.

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 'constants/expressions.dart';
 import 'constants/values.dart' show
     ConstantValue,
     ConstructedConstantValue,
@@ skipping 20 matching lines @@
     ElementKind,
     Elements,
     FunctionElement,
     LibraryElement,
     MetadataAnnotation,
     PrefixElement,
     ScopeContainerElement,
     TypedefElement,
     VoidElement;
 
+import 'dart_types.dart';
+
 import 'util/util.dart' show
     Link, makeUnique;
 import 'util/uri_extras.dart' as uri_extras;
 
 import 'util/setlet.dart' show
     Setlet;
 
 import 'tree/tree.dart' show
     Import,
     LibraryTag,
@@ skipping 243 matching lines @@
     }
 
     // TODO(sigurdm): How is metadata on a patch-class handled?
     for (MetadataAnnotation metadata in element.metadata) {
       ConstantExpression constant =
           backend.constants.getConstantForMetadata(metadata);
       if (constant != null) {
         addConstants(constant.value);
       }
     }
+
+    collectTypeDependencies(DartType type) {
+      if (type is FunctionType) {
+        for (DartType argumentType in type.parameterTypes) {
+          collectTypeDependencies(argumentType);
+        }
+        for (DartType argumentType in type.optionalParameterTypes) {
+          collectTypeDependencies(argumentType);
+        }
+        for (DartType argumentType in type.namedParameterTypes) {
+          collectTypeDependencies(argumentType);
+        }
+        collectTypeDependencies(type.returnType);
+      } else if (type is TypedefType) {
+        type.element.alias;

[karlklose, 2015/04/13 08:10:57]

Add the type's element to elements?

Shouldn't this be collectTypeDependencies(type.unalias)?

[sigurdm, 2015/04/13 13:37:08]

Done
Done

Thanks!

+      } else if (type is InterfaceType) {
+        elements.add(type.element);
+      }
+    }
+
+    if (element is FunctionElement) {
+      collectTypeDependencies(element.type);
+    }
+
     if (element.isClass) {
       // If we see a class, add everything its live instance members refer
       // to.  Static members are not relevant, unless we are processing
       // extra dependencies due to mirrors.
       void addLiveInstanceMember(Element element) {
         if (!compiler.enqueuer.resolution.hasBeenResolved(element)) return;
         if (!isMirrorUsage && !element.isInstanceMember) return;
         collectDependencies(element.implementation);
       }
       ClassElement cls = element.declaration;
@@ skipping 515 matching lines @@
         _importingLibrary = importingLibrary;
 
   String get importingLibraryName {
     String libraryName = _importingLibrary.getLibraryName();
     return libraryName == ""
       ? "<unnamed>"
       : libraryName;
   }
 
 }