Index: tests/compiler/dart2js/memory_compiler.dart |
diff --git a/tests/compiler/dart2js/memory_compiler.dart b/tests/compiler/dart2js/memory_compiler.dart |
index 9bea288f3560622335cabec866dcca82db5f1149..08bc6150849adf2628e4d53adb2b05e35d0f0ea1 100644 |
--- a/tests/compiler/dart2js/memory_compiler.dart |
+++ b/tests/compiler/dart2js/memory_compiler.dart |
@@ -7,16 +7,19 @@ library dart2js.test.memory_compiler; |
import 'memory_source_file_helper.dart'; |
import 'package:compiler/implementation/dart2jslib.dart' |
- show NullSink; |
+ show NullSink; |
import 'package:compiler/compiler.dart' |
- show Diagnostic, DiagnosticHandler, CompilerOutputProvider; |
+ show Diagnostic, DiagnosticHandler, CompilerOutputProvider; |
import 'dart:async'; |
import 'package:compiler/implementation/mirrors/source_mirrors.dart'; |
import 'package:compiler/implementation/mirrors/analyze.dart'; |
+import 'package:compiler/implementation/library_loader.dart' |
+ show LoadedLibraries; |
+ |
class DiagnosticMessage { |
final Uri uri; |
final int begin; |
@@ -183,7 +186,7 @@ Compiler compilerFor(Map<String,String> memorySourceFiles, |
}); |
// TODO(johnniwinther): Assert that no libraries are loaded lazily from |
// this call. |
- compiler.onLibrariesLoaded(copiedLibraries); |
+ compiler.onLibrariesLoaded(new MemoryLoadedLibraries(copiedLibraries)); |
compiler.symbolConstructor = cachedCompiler.symbolConstructor; |
compiler.mirrorSystemClass = cachedCompiler.mirrorSystemClass; |
@@ -229,6 +232,27 @@ Compiler compilerFor(Map<String,String> memorySourceFiles, |
return compiler; |
} |
+class MemoryLoadedLibraries implements LoadedLibraries { |
+ final Map copiedLibraries; |
+ |
+ MemoryLoadedLibraries(this.copiedLibraries); |
+ |
+ @override |
+ bool containsLibrary(Uri uri) => copiedLibraries.containsKey(uri); |
+ |
+ @override |
+ void forEachImportChain(f) {} |
+ |
+ @override |
+ void forEachLibrary(f) {} |
+ |
+ @override |
+ getLibrary(Uri uri) => copiedLibraries[uri]; |
+ |
+ @override |
+ Uri get rootUri => null; |
+} |
+ |
Future<MirrorSystem> mirrorSystemFor(Map<String,String> memorySourceFiles, |
{DiagnosticHandler diagnosticHandler, |
List<String> options: const [], |