Load patches via callback.

sdk/lib/_internal/compiler/implementation/js_backend/backend.dart

Index: sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
index 57b0ffd3b884749d2281bdfabfc8f755f70cba76..b1fadeb027a85b6826de28a8f35d93e256fd5731 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
@@ -1601,70 +1601,73 @@ class JavaScriptBackend extends Backend {
     return false;
   }
 
-  void onLibraryScanned(LibraryElement library) {
-    Uri uri = library.canonicalUri;
-
-    // TODO(johnniwinther): Assert that the elements are found.
-    VariableElement findVariable(String name) {
-      return library.find(name);
-    }
-
-    FunctionElement findMethod(String name) {
-      return library.find(name);
-    }
-
-    ClassElement findClass(String name) {
-      return library.find(name);
-    }
-
-    if (uri == Compiler.DART_INTERCEPTORS) {
-      getInterceptorMethod = findMethod('getInterceptor');
-      interceptedNames = findVariable('interceptedNames');
-      mapTypeToInterceptor = findVariable('mapTypeToInterceptor');
-      getNativeInterceptorMethod = findMethod('getNativeInterceptor');
-
-      List<ClassElement> classes = [
-        jsInterceptorClass = findClass('Interceptor'),
-        jsStringClass = findClass('JSString'),
-        jsArrayClass = findClass('JSArray'),
-        // The int class must be before the double class, because the
-        // emitter relies on this list for the order of type checks.
-        jsIntClass = findClass('JSInt'),
-        jsPositiveIntClass = findClass('JSPositiveInt'),
-        jsUInt32Class = findClass('JSUInt32'),
-        jsUInt31Class = findClass('JSUInt31'),
-        jsDoubleClass = findClass('JSDouble'),
-        jsNumberClass = findClass('JSNumber'),
-        jsNullClass = findClass('JSNull'),
-        jsBoolClass = findClass('JSBool'),
-        jsMutableArrayClass = findClass('JSMutableArray'),
-        jsFixedArrayClass = findClass('JSFixedArray'),
-        jsExtendableArrayClass = findClass('JSExtendableArray'),
-        jsPlainJavaScriptObjectClass = findClass('PlainJavaScriptObject'),
-        jsUnknownJavaScriptObjectClass = findClass('UnknownJavaScriptObject'),
-      ];
-
-      jsIndexableClass = findClass('JSIndexable');
-      jsMutableIndexableClass = findClass('JSMutableIndexable');
-    } else if (uri == Compiler.DART_JS_HELPER) {
-      typeLiteralClass = findClass('TypeImpl');
-      constMapLiteralClass = findClass('ConstantMap');
-      typeVariableClass = findClass('TypeVariable');
-
-      jsIndexingBehaviorInterface = findClass('JavaScriptIndexingBehavior');
-
-      noSideEffectsClass = findClass('NoSideEffects');
-      noThrowsClass = findClass('NoThrows');
-      noInlineClass = findClass('NoInline');
-      irRepresentationClass = findClass('IrRepresentation');
-    } else if (uri == DART_JS_MIRRORS) {
-      disableTreeShakingMarker = library.find('disableTreeShaking');
-      preserveMetadataMarker = library.find('preserveMetadata');
-    } else if (uri == DART_JS_NAMES) {
-      preserveNamesMarker = library.find('preserveNames');
-    } else if (uri == Compiler.DART_JS_HELPER) {
-      getIsolateAffinityTagMarker = library.find('getIsolateAffinityTag');
-    }
+  Future onLibraryScanned(LibraryElement library,
+                          LibraryLoader loader) {

[floitsch, 2014/06/24 09:01:54]

might fit on one line?

[Johnni Winther, 2014/06/24 09:12:58]

Done.

+    return super.onLibraryScanned(library, loader).then((_) {
+      Uri uri = library.canonicalUri;
+
+      // TODO(johnniwinther): Assert that the elements are found.
+      VariableElement findVariable(String name) {
+        return library.find(name);
+      }
+
+      FunctionElement findMethod(String name) {
+        return library.find(name);
+      }
+
+      ClassElement findClass(String name) {
+        return library.find(name);
+      }
+
+      if (uri == Compiler.DART_INTERCEPTORS) {
+        getInterceptorMethod = findMethod('getInterceptor');
+        interceptedNames = findVariable('interceptedNames');
+        mapTypeToInterceptor = findVariable('mapTypeToInterceptor');
+        getNativeInterceptorMethod = findMethod('getNativeInterceptor');
+
+        List<ClassElement> classes = [
+          jsInterceptorClass = findClass('Interceptor'),
+          jsStringClass = findClass('JSString'),
+          jsArrayClass = findClass('JSArray'),
+          // The int class must be before the double class, because the
+          // emitter relies on this list for the order of type checks.
+          jsIntClass = findClass('JSInt'),
+          jsPositiveIntClass = findClass('JSPositiveInt'),
+          jsUInt32Class = findClass('JSUInt32'),
+          jsUInt31Class = findClass('JSUInt31'),
+          jsDoubleClass = findClass('JSDouble'),
+          jsNumberClass = findClass('JSNumber'),
+          jsNullClass = findClass('JSNull'),
+          jsBoolClass = findClass('JSBool'),
+          jsMutableArrayClass = findClass('JSMutableArray'),
+          jsFixedArrayClass = findClass('JSFixedArray'),
+          jsExtendableArrayClass = findClass('JSExtendableArray'),
+          jsPlainJavaScriptObjectClass = findClass('PlainJavaScriptObject'),
+          jsUnknownJavaScriptObjectClass = findClass('UnknownJavaScriptObject'),
+        ];
+
+        jsIndexableClass = findClass('JSIndexable');
+        jsMutableIndexableClass = findClass('JSMutableIndexable');
+      } else if (uri == Compiler.DART_JS_HELPER) {
+        typeLiteralClass = findClass('TypeImpl');
+        constMapLiteralClass = findClass('ConstantMap');
+        typeVariableClass = findClass('TypeVariable');
+
+        jsIndexingBehaviorInterface = findClass('JavaScriptIndexingBehavior');
+
+        noSideEffectsClass = findClass('NoSideEffects');
+        noThrowsClass = findClass('NoThrows');
+        noInlineClass = findClass('NoInline');
+        irRepresentationClass = findClass('IrRepresentation');
+      } else if (uri == DART_JS_MIRRORS) {
+        disableTreeShakingMarker = library.find('disableTreeShaking');
+        preserveMetadataMarker = library.find('preserveMetadata');
+      } else if (uri == DART_JS_NAMES) {
+        preserveNamesMarker = library.find('preserveNames');
+      } else if (uri == Compiler.DART_JS_HELPER) {
+        getIsolateAffinityTagMarker = library.find('getIsolateAffinityTag');
+      }
+    });
   }
 
   Future onLibrariesLoaded(Map<Uri, LibraryElement> loadedLibraries) {