Support reading summaries in DDC

[email protected]

Review URL: https://codereview.chromium.org/1893603003 .

Author: John Messerly

bin/dartdevc.dart

@@ -46,7 +46,7 @@ main(List<String> args) async {
   runner.addCommand(new CompileCommand());
   try {
     await runner.run(args);
-  } catch(e, s) {
+  } catch (e, s) {
     exit(handleError(e, s, args));
   }
 }

lib/src/analyzer/context.dart

@@ -16,6 +16,11 @@ import 'package:analyzer/src/generated/source_io.dart'
         PackageUriResolver,
         SourceFactory,
         UriResolver;
+import 'package:analyzer/src/summary/package_bundle_reader.dart'
+    show
+        InSummaryPackageUriResolver,
+        InputPackagesResultProvider,
+        SummaryDataStore;
 import 'package:cli_util/cli_util.dart' show getSdkDir;
 
 import 'dart_sdk.dart' show MockDartSdk, mockSdkSources;
@@ -97,9 +102,30 @@ class AnalyzerOptions {
 AnalysisContext createAnalysisContextWithSources(AnalyzerOptions options,
     {DartUriResolver sdkResolver, List<UriResolver> fileResolvers}) {
   AnalysisEngine.instance.processRequiredPlugins();
-  var srcFactory = createSourceFactory(options,
-      sdkResolver: sdkResolver, fileResolvers: fileResolvers);
-  return createAnalysisContext()..sourceFactory = srcFactory;
+
+  sdkResolver ??= options.useMockSdk
+      ? createMockSdkResolver(mockSdkSources)
+      : createSdkPathResolver(options.dartSdkPath);
+
+  // Read the summaries.
+  SummaryDataStore summaryData;
+  if (options.summaryPaths.isNotEmpty) {
+    summaryData = new SummaryDataStore(options.summaryPaths);
+  }
+
+  var srcFactory = _createSourceFactory(options,
+      sdkResolver: sdkResolver,
+      fileResolvers: fileResolvers,
+      summaryData: summaryData);
+
+  var context = createAnalysisContext();
+  context.sourceFactory = srcFactory;
+  if (summaryData != null) {
+    context.typeProvider = sdkResolver.dartSdk.context.typeProvider;
+    context.resultProvider =
+        new InputPackagesResultProvider(context, summaryData);
+  }
+  return context;
 }
 
 /// Creates an analysis context that contains our restricted typing rules.
@@ -116,17 +142,19 @@ AnalysisContext createAnalysisContext() {
 ///
 /// If supplied, [fileResolvers] will override the default `file:` and
 /// `package:` URI resolvers.
-SourceFactory createSourceFactory(AnalyzerOptions options,
-    {DartUriResolver sdkResolver, List<UriResolver> fileResolvers}) {
-  sdkResolver ??= options.useMockSdk
-      ? createMockSdkResolver(mockSdkSources)
-      : createSdkPathResolver(options.dartSdkPath);
-
+SourceFactory _createSourceFactory(AnalyzerOptions options,
+    {DartUriResolver sdkResolver,
+    List<UriResolver> fileResolvers,
+    SummaryDataStore summaryData}) {
   var resolvers = <UriResolver>[];
   if (options.customUrlMappings.isNotEmpty) {
     resolvers.add(new CustomUriResolver(options.customUrlMappings));
   }
   resolvers.add(sdkResolver);
+  if (summaryData != null) {
+    resolvers.add(new InSummaryPackageUriResolver(summaryData));
+  }
+
   if (fileResolvers == null) fileResolvers = createFileResolvers(options);
   resolvers.addAll(fileResolvers);
   return new SourceFactory(resolvers);

test/worker/worker_test.dart

@@ -70,17 +70,72 @@ main() {
       expect(await messageGrouper.next, isNull);
     });
 
-    test('can compile in basic mode', () async {
+    test('can compile in basic mode', () {
       var args = new List.from(executableArgs)..addAll(compilerArgs);
-      var process = await Process.start('dart', args);
-      stderr.addStream(process.stderr);
-      var futureProcessOutput = process.stdout.map(UTF8.decode).toList();
+      var result = Process.runSync('dart', args);
 
-      expect(await process.exitCode, EXIT_CODE_OK);
-      expect((await futureProcessOutput).join(), isEmpty);
+      expect(result.exitCode, EXIT_CODE_OK);
+      expect(result.stdout, isEmpty);
+      expect(result.stderr, isEmpty);
       expect(outputJsFile.existsSync(), isTrue);
     });
   });
+
+  group('Hello World with Summaries', () {
+    final greetingDart = new File('test/worker/greeting.dart').absolute;
+    final helloDart = new File('test/worker/hello.dart').absolute;
+
+    final greetingJS = new File('test/worker/greeting.js').absolute;
+    final greetingSummary = new File('test/worker/greeting.sum').absolute;
+    final helloJS = new File('test/worker/hello_world.js').absolute;
+
+    setUp(() {
+      greetingDart.writeAsStringSync('String greeting = "hello";');
+      helloDart.writeAsStringSync(
+          'import "greeting.dart";'
+          'main() => print(greeting);');
+    });
+
+    tearDown(() {
+      if (greetingDart.existsSync()) greetingDart.deleteSync();
+      if (helloDart.existsSync()) helloDart.deleteSync();
+      if (greetingJS.existsSync()) greetingJS.deleteSync();
+      if (greetingSummary.existsSync()) greetingSummary.deleteSync();
+      if (helloJS.existsSync()) helloJS.deleteSync();
+    });
+
+    test('can compile in basic mode', () {
+      var result = Process.runSync('dart', [
+        'bin/dartdevc.dart',
+        'compile',
+        '--no-source-map',
+        '-o',
+        greetingJS.path,
+        greetingDart.path,
+      ]);
+      expect(result.exitCode, EXIT_CODE_OK);
+      expect(result.stdout, isEmpty);
+      expect(result.stderr, isEmpty);
+      expect(greetingJS.existsSync(), isTrue);
+      expect(greetingSummary.existsSync(), isTrue);
+
+      result = Process.runSync('dart', [
+        'bin/dartdevc.dart',
+        'compile',
+        '--no-source-map',
+        '--no-summarize',
+        '-s',
+        greetingSummary.path,
+        '-o',
+        helloJS.path,
+        helloDart.path,
+      ]);
+      expect(result.exitCode, EXIT_CODE_OK);
+      expect(result.stdout, isEmpty);
+      expect(result.stderr, isEmpty);
+      expect(helloJS.existsSync(), isTrue);
+    });
+  });
 }
 
 Future<WorkResponse> _readResponse(MessageGrouper messageGrouper) async {