Add support for unlinked summary inputs through --build-summary-unlinked-input

pkg/analyzer_cli/lib/src/build_mode.dart

 // Copyright (c) 2015, 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 analyzer_cli.src.build_mode;
 
 import 'dart:core';
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/ast/ast.dart' show CompilationUnit;
@@ skipping 114 matching lines @@
  */
 class BuildMode {
   final ResourceProvider resourceProvider;
   final CommandLineOptions options;
   final AnalysisStats stats;
 
   SummaryDataStore summaryDataStore;
   InternalAnalysisContext context;
   Map<Uri, File> uriToFileMap;
   final List<Source> explicitSources = <Source>[];
+  final List<PackageBundle> unlinkedBundles = <PackageBundle>[];
 
   PackageBundleAssembler assembler;
   final Set<Source> processedSources = new Set<Source>();
   final Map<Uri, UnlinkedUnit> uriToUnit = <Uri, UnlinkedUnit>{};
 
   BuildMode(this.resourceProvider, this.options, this.stats);
 
   bool get _shouldOutputSummary =>
       options.buildSummaryOutput != null ||
       options.buildSummaryOutputSemantic != null;
@@ skipping 60 matching lines @@
     // Write summary.
     assembler = new PackageBundleAssembler();
     if (_shouldOutputSummary) {
       if (options.buildSummaryOnlyUnlinked) {
         for (var src in explicitSources) {
           // Note: This adds the unit to the assembler if it needed to be
           // computed, so we don't need to explicitly do that.
           _unlinkedUnitForUri('${src.uri}');
         }
       } else {
-        _serializeAstBasedSummary(explicitSources);
+        Set<String> unlinkedUris =
+            explicitSources.map((Source s) => s.uri.toString()).toSet();
+        for (var bundle in unlinkedBundles) {
+          unlinkedUris.addAll(
+              bundle.unlinkedUnitUris.where((uri) => !uri.startsWith('dart:')));

[Paul Berry, 2017/04/26 15:28:31]

Why is `!uri.startsWith('dart:')` necessary?  It seems like `dart:` URIs should
always come from the SDK bundle, so they should never appear in unlinkedBundles.

[jakemac, 2017/04/26 16:06:09]

Oh I think this was just necessary for linked summaries, removed.

+        }
+
+        _serializeAstBasedSummary(unlinkedUris);
         assembler.recordDependencies(summaryDataStore);
       }
       // Write the whole package bundle.
       PackageBundleBuilder bundle = assembler.assemble();
       if (options.buildSummaryOutput != null) {
         io.File file = new io.File(options.buildSummaryOutput);
         file.writeAsBytesSync(bundle.toBuffer(), mode: io.FileMode.WRITE_ONLY);
       }
       if (options.buildSummaryOutputSemantic != null) {
         bundle.flushInformative();
@@ skipping 23 matching lines @@
             maxSeverity = maxSeverity.max(processedSeverity.severity);
           }
         }
       }
     }
     return maxSeverity;
   }
 
   void _createContext() {
     // Read the summaries.
-    summaryDataStore = new SummaryDataStore(options.buildSummaryInputs,
+    summaryDataStore = new SummaryDataStore(<String>[],
         recordDependencyInfo: _shouldOutputSummary);
 
+    // Adds a bundle at `path` to `summaryDataStore`.
+    PackageBundle addBundle(String path) {
+      var bundle =
+          new PackageBundle.fromBuffer(new io.File(path).readAsBytesSync());
+      summaryDataStore.addBundle(path, bundle);
+      return bundle;
+    }
+
+    for (var path in options.buildSummaryInputs) {
+      var bundle = addBundle(path);
+      if (bundle.linkedLibraryUris.isEmpty &&

[jakemac, 2017/04/25 17:59:57]

I am not sure if this is 100% sane, but it seems to work for the examples I
tried.

+          bundle.unlinkedUnitUris.isNotEmpty) {
+        throw new ArgumentError(
+            'Got an unlinked summary for --build-summary-input at `$path`. '
+            'Unlinked summaries should be provided with the '
+            '--build-summary-unlinked-input argument.');
+      }
+    }
+
+    for (var path in options.buildSummaryUnlinkedInputs) {
+      var bundle = addBundle(path);
+      unlinkedBundles.add(bundle);
+      if (bundle.linkedLibraryUris.isNotEmpty) {
+        throw new ArgumentError(
+            'Got a linked summary for --build-summary-input-unlinked at `$path`'
+            '. Linked bundles should be provided with the '
+            '--build-summary-input argument.');
+      }
+    }
+
     DartSdk sdk;
     PackageBundle sdkBundle;
     if (options.dartSdkSummaryPath != null) {
       SummaryBasedDartSdk summarySdk = new SummaryBasedDartSdk(
           options.dartSdkSummaryPath, options.strongMode);
       sdk = summarySdk;
       sdkBundle = summarySdk.bundle;
     } else {
       FolderBasedDartSdk dartSdk = new FolderBasedDartSdk(resourceProvider,
           resourceProvider.getFolder(options.dartSdkPath), options.strongMode);
@@ skipping 78 matching lines @@
       sink.write(buffer);
     } else {
       new io.File(outputPath).writeAsStringSync(buffer.toString());
     }
   }
 
   /**
    * Serialize the package with the given [sources] into [assembler] using only
    * their ASTs and [LinkedUnit]s of input packages.
    */
-  void _serializeAstBasedSummary(List<Source> sources) {
-    Set<String> sourceUris =
-        sources.map((Source s) => s.uri.toString()).toSet();
-
+  void _serializeAstBasedSummary(Set<String> unlinkedUris) {
     LinkedLibrary _getDependency(String absoluteUri) =>
         summaryDataStore.linkedMap[absoluteUri];
 
     Map<String, LinkedLibraryBuilder> linkResult = link(
-        sourceUris,
+        unlinkedUris,
         _getDependency,
         _unlinkedUnitForUri,
         context.declaredVariables.get,
         options.strongMode);
     linkResult.forEach(assembler.addLinkedLibrary);
   }
 
   /**
    * Returns the [UnlinkedUnit] for [absoluteUri], either by computing it or
    * using the stored one in [uriToUnit].
@@ skipping 62 matching lines @@
    * Build the inverse mapping of [uriToSourceMap].
    */
   static Map<String, Uri> _computePathToUriMap(Map<Uri, File> uriToSourceMap) {
     Map<String, Uri> pathToUriMap = <String, Uri>{};
     uriToSourceMap.forEach((Uri uri, File file) {
       pathToUriMap[file.path] = uri;
     });
     return pathToUriMap;
   }
 }