Make deferred loading and meta-data play better.

sdk/lib/_internal/compiler/implementation/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 'dart2jslib.dart' show
     Compiler,
     CompilerTask,
     Constant,
@@ skipping 253 matching lines @@
 
   /// Finds all elements and constants that [element] depends directly on.
   /// (not the transitive closure.)
   ///
   /// Adds the results to [elements] and [constants].
   void _collectAllElementsAndConstantsResolvedFrom(Element element,
       Set<Element> elements,
       Set<Constant> constants) {
     element = element.implementation;
     for (MetadataAnnotation metadata in element.metadata) {
-      if (metadata.value != null) constants.add(metadata.value);
+      if (metadata.value != null) {
+        constants.add(metadata.value);
+        elements.add(metadata.value.computeType(compiler).element);
+      }
     }
     if (element.isClass()) {
       // If we see a class, add everything its instance members refer
       // to.  Static members are not relevant.
       ClassElement cls = element.declaration;
       cls.forEachLocalMember((Element e) {
         if (!e.isInstanceMember()) return;
         _collectDependencies(e.implementation, elements, constants);
       });
       if (cls.implementation != cls) {
@@ skipping 87 matching lines @@
   ///
   /// The elements are added with [_mapDependencies].
   void _addMirrorElements() {
     MirrorUsageAnalyzerTask mirrorTask = compiler.mirrorUsageAnalyzerTask;
     // For each import we record all mirrors-used elements from all the
     // libraries reached directly from that import.
     for (Import deferredImport in _allDeferredImports.keys) {
       LibraryElement deferredLibrary = _allDeferredImports[deferredImport];
       for (LibraryElement library in
           _nonDeferredReachableLibraries(deferredLibrary)) {
+        // TODO(sigurdm): The metadata should go to the right output unit.
+        // For now they all go to the main output unit.
+        for (MetadataAnnotation metadata in library.metadata) {
+          if (metadata.value != null) {
+            _mapDependencies(metadata.value.computeType(compiler).element,
+                _fakeMainImport);
+          }
+        }
+        for (LibraryTag tag in library.tags) {
+          for (MetadataAnnotation metadata in tag.metadata) {
+            if (metadata.value != null) {
+              _mapDependencies(metadata.value.computeType(compiler).element,
+                  _fakeMainImport);
+            }
+          }
+        }
+
         if (mirrorTask.librariesWithUsage.contains(library)) {
 
           Map<LibraryElement, List<MirrorUsage>> mirrorsResult =
               mirrorTask.analyzer.collectMirrorsUsedAnnotation();
 
           // If there is a MirrorsUsed annotation we add only the needed
           // things to the output units for the library.
           List<MirrorUsage> mirrorUsages = mirrorsResult[library];
           if (mirrorUsages == null) continue;
           for (MirrorUsage usage in mirrorUsages) {
@@ skipping 289 matching lines @@
       });
     }
     if (splitProgram && !deferredUsedFromMain) {
       compiler.reportInfo(
           lastDeferred,
           MessageKind.DEFERRED_LIBRARY_NOT_FROM_MAIN);
       splitProgram = false;
     }
   }
 }