Recompute librariesByName after loading a deferred library.

sdk/lib/_internal/compiler/js_lib/js_mirrors.dart

 // Copyright (c) 2013, 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 dart._js_mirrors;
 
 import 'shared/runtime_data.dart' as encoding;
 import 'shared/embedded_names.dart' show
     ALL_CLASSES,
     LAZIES,
@@ skipping 30 matching lines @@
     TypeVariable,
     UnimplementedNoSuchMethodError,
     createRuntimeType,
     createUnmangledInvocationMirror,
     getMangledTypeName,
     getMetadata,
     getRuntimeType,
     runtimeTypeToString,
     setRuntimeTypeInfo,
     throwInvalidReflectionError,
-    TypeImpl;
+    TypeImpl,
+    deferredLoadHook;
 
 import 'dart:_interceptors' show
     Interceptor,
     JSArray,
     JSExtendableArray,
     getInterceptor;
 
 import 'dart:_js_names';
 
 const String METHODS_WITH_OPTIONAL_ARGUMENTS = r'$methodsWithOptionalArguments';
@@ skipping 28 matching lines @@
 
   final IsolateMirror isolate = new JsIsolateMirror();
 
   JsTypeMirror get dynamicType => _dynamicType;
   JsTypeMirror get voidType => _voidType;
 
   static final JsTypeMirror _dynamicType =
       new JsTypeMirror(const Symbol('dynamic'));
   static final JsTypeMirror _voidType = new JsTypeMirror(const Symbol('void'));
 
-  static final Map<String, List<LibraryMirror>> librariesByName =
-      computeLibrariesByName();
+  static Map<String, List<LibraryMirror>> _librariesByName;
+
+  // Will be set to `true` when we have installed a hook on [deferredLoadHook]
+  // to avoid installing it multiple times.
+  static bool _hasInstalledDeferredLoadHook = false;
+
+  static Map<String, List<LibraryMirror>> get librariesByName {
+    if (_librariesByName == null) {
+      _librariesByName = computeLibrariesByName();
+      if (!_hasInstalledDeferredLoadHook) {
+        _hasInstalledDeferredLoadHook = true;
+        // After a deferred import has been loaded new libraries might have
+        // been created, so in the hook we erase _librariesByName, so it will be
+        // recomputed on the next access.
+        deferredLoadHook = () => _librariesByName = null;
+      }
+    }
+    return _librariesByName;
+  }
 
   Map<Uri, LibraryMirror> get libraries {
     if (_cachedLibraries != null) return _cachedLibraries;
     Map<Uri, LibraryMirror> result = new Map();
     for (List<LibraryMirror> list in librariesByName.values) {
       for (LibraryMirror library in list) {
         result[library.uri] = library;
       }
     }
     return _cachedLibraries =
@@ skipping 2825 matching lines @@
   // have a part (following a '.') that starts with '_'.
   const int UNDERSCORE = 0x5f;
   if (name.isEmpty) return true;
   int index = -1;
   do {
     if (name.codeUnitAt(index + 1) == UNDERSCORE) return false;
     index = name.indexOf('.', index + 1);
   } while (index >= 0 && index + 1 < name.length);
   return true;
 }