Index: tests/compiler/dart2js/memory_compiler.dart |
diff --git a/tests/compiler/dart2js/memory_compiler.dart b/tests/compiler/dart2js/memory_compiler.dart |
index 07fc7798fb48af31a7783243fa3070147ae93af0..a33b7e7074977858d7ebf9f76cede0a8efb4b6a7 100644 |
--- a/tests/compiler/dart2js/memory_compiler.dart |
+++ b/tests/compiler/dart2js/memory_compiler.dart |
@@ -164,21 +164,18 @@ Compiler compilerFor(Map<String,String> memorySourceFiles, |
options, |
{}); |
if (cachedCompiler != null) { |
- compiler.coreLibrary = cachedCompiler.libraries['dart:core']; |
+ compiler.coreLibrary = |
+ cachedCompiler.libraryLoader.lookupLibrary(Uri.parse('dart:core')); |
compiler.types = cachedCompiler.types.copy(compiler); |
Map copiedLibraries = {}; |
- cachedCompiler.libraries.forEach((String uri, library) { |
+ cachedCompiler.libraryLoader.libraries.forEach((library) { |
if (library.isPlatformLibrary) { |
+ compiler.libraryLoader.mapLibrary(library); |
compiler.onLibraryCreated(library); |
- compiler.libraries[uri] = library; |
- // TODO(johnniwinther): Assert that no libraries are created lazily from |
- // this call. |
compiler.onLibraryScanned(library, null); |
if (library.isPatched) { |
var patchLibrary = library.patch; |
compiler.onLibraryCreated(patchLibrary); |
- // TODO(johnniwinther): Assert that no libraries are created lazily |
- // from this call. |
compiler.onLibraryScanned(patchLibrary, null); |
} |
copiedLibraries[library.canonicalUri] = library; |