Load builtin helper libraries on demand.

sdk/lib/_internal/compiler/implementation/compiler.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;
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
@@ skipping 188 matching lines @@
   ClassElement defaultSuperclass(ClassElement element) => compiler.objectClass;
 
   bool isDefaultNoSuchMethodImplementation(Element element) {
     assert(element.name == Compiler.NO_SUCH_METHOD);
     ClassElement classElement = element.getEnclosingClass();
     return classElement == compiler.objectClass;
   }
 
   void registerStaticUse(Element element, Enqueuer enqueuer) {}
 
-  void onLibraryScanned(LibraryElement library, Uri uri) {}
+  void onLibraryLoaded(LibraryElement library, Uri uri) {}
 
   void registerMetadataInstantiatedType(DartType type, TreeElements elements) {}
   void registerMetadataStaticUse(Element element) {}
   void registerMetadataGetOfStaticFunction(FunctionElement element) {}
 
   /// Called by [MirrorUsageAnalyzerTask] after it has merged all @MirrorsUsed
   /// annotations. The arguments corresponds to the unions of the corresponding
   /// fields of the annotations.
   void registerMirrorUsage(Set<String> symbols,
                            Set<Element> targets,
@@ skipping 477 matching lines @@
     }
     return !compilationFailed;
   }
 
   bool hasIsolateSupport() => isolateLibrary != null;
 
   /**
    * This method is called before [library] import and export scopes have been
    * set up.
    */
-  void onLibraryScanned(LibraryElement library, Uri uri) {
+  void onLibraryLoaded(LibraryElement library, Uri uri) {
     if (dynamicClass != null) {
       // When loading the built-in libraries, dynamicClass is null. We
       // take advantage of this as core imports js_helper and sees [dynamic]
       // this way.
       withCurrentElement(dynamicClass, () {
         library.addToScope(dynamicClass, this);
       });
     }
     if (uri == new Uri(scheme: 'dart', path: 'mirrors')) {
       mirrorsLibrary = library;
       mirrorSystemClass =
           findRequiredElement(library, const SourceString('MirrorSystem'));
       mirrorsUsedClass =
           findRequiredElement(library, const SourceString('MirrorsUsed'));
     } else if (uri == new Uri(scheme: 'dart', path: '_collection-dev')) {
       symbolImplementationClass =
           findRequiredElement(library, const SourceString('Symbol'));
     } else if (uri == new Uri(scheme: 'dart', path: 'async')) {
       deferredLibraryClass =
           findRequiredElement(library, const SourceString('DeferredLibrary'));
     }

[ngeoffray, 2013/08/15 19:13:02]

Nit: Keep the else/if syntax.

[zarah, 2013/08/28 10:20:13]

Done.

-    backend.onLibraryScanned(library, uri);
+
+    if (isolateHelperLibrary == null
+        && (uri == new Uri(scheme: 'dart', path: '_isolate_helper'))) {
+      isolateHelperLibrary = scanBuiltinLibrary('_isolate_helper');
+    } else if (foreignLibrary == null
+        && (uri == new Uri(scheme: 'dart', path: '_foreign_helper'))) {

[ngeoffray, 2013/08/15 19:13:02]

Nit: '&&' at the same indentation as foreignLibrary === null

[zarah, 2013/08/28 10:20:13]

Done.

+      foreignLibrary = scanBuiltinLibrary('_foreign_helper');
+    }
+    backend.onLibraryLoaded(library, uri);
   }
 
   Element findRequiredElement(LibraryElement library, SourceString name) {
     var element = library.find(name);
     if (element == null) {
       internalErrorOnElement(
           library,
           'The library "${library.canonicalUri}" does not contain required '
           'element: ${name.slowToString()}');
       }
@@ skipping 87 matching lines @@
   Element get filledListConstructor {
     if (_filledListConstructor != null) return _filledListConstructor;
     Selector callConstructor = new Selector.callConstructor(
         const SourceString("filled"), listClass.getLibrary());
     return _filledListConstructor =
         listClass.lookupConstructor(callConstructor);
   }
 
   void scanBuiltinLibraries() {
     jsHelperLibrary = scanBuiltinLibrary('_js_helper');
     interceptorsLibrary = scanBuiltinLibrary('_interceptors');

[ngeoffray, 2013/08/15 19:13:02]

What about those two? Do you plan on moving them? Are there some restrictions
that prevent moving them?

[zarah, 2013/08/28 10:20:13]

The jsHelperLibrary is used just below and the interceptorsLibrary is used in
findInterceptor() so they cannot be moved unfortunately.

-    foreignLibrary = scanBuiltinLibrary('_foreign_helper');
-    isolateHelperLibrary = scanBuiltinLibrary('_isolate_helper');
-
     assertMethod = jsHelperLibrary.find(const SourceString('assertHelper'));
     identicalFunction = coreLibrary.find(const SourceString('identical'));
 
     initializeSpecialClasses();
 
     functionClass.ensureResolved(this);
     functionApplyMethod =
         functionClass.lookupLocalMember(const SourceString('apply'));
     jsInvocationMirrorClass.ensureResolved(this);
     invokeOnMethod = jsInvocationMirrorClass.lookupLocalMember(INVOKE_ON);
@@ skipping 624 matching lines @@
 
   void close() {}
 
   toString() => name;
 
   /// Convenience method for getting an [api.CompilerOutputProvider].
   static NullSink outputProvider(String name, String extension) {
     return new NullSink('$name.$extension');
   }
 }