Index: sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart |
index 5a402aa9aac9751041505396f714becaa0a669a0..80e4efd1929a2a413bd05a0fea17931c2b390f55 100644 |
--- a/sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart |
+++ b/sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart |
@@ -461,10 +461,13 @@ class DartBackend extends Backend { |
log(String message) => compiler.log('[DartBackend] $message'); |
- Future onLibraryLoaded(LibraryElement library, Uri uri) { |
- if (useMirrorHelperLibrary && library == compiler.mirrorsLibrary) { |
- return compiler.scanBuiltinLibrary( |
- MirrorRenamer.MIRROR_HELPER_LIBRARY_NAME). |
+ Future onLibrariesLoaded(Map<Uri, LibraryElement> loadedLibraries) { |
+ if (useMirrorHelperLibrary && |
+ loadedLibraries.containsKey(Compiler.DART_MIRRORS)) { |
+ return compiler.libraryLoader.loadLibrary( |
+ compiler.translateResolvedUri( |
+ loadedLibraries[Compiler.DART_MIRRORS], |
+ MirrorRenamer.DART_MIRROR_HELPER, null)). |
then((LibraryElement element) { |
mirrorHelperLibrary = element; |
mirrorHelperGetNameFunction = mirrorHelperLibrary.find( |