Modify build mode to use the linker when building summaries from ASTs.

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' hide Resource;
 import 'dart:io' as io;
 
-import 'package:protobuf/protobuf.dart';
-
 import 'package:analyzer/dart/ast/ast.dart' show CompilationUnit;
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
+import 'package:analyzer/src/summary/link.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
-import 'package:analyzer/src/summary/prelink.dart';
 import 'package:analyzer/src/summary/summarize_ast.dart';
 import 'package:analyzer/src/summary/summarize_elements.dart';
 import 'package:analyzer/task/dart.dart';
 import 'package:analyzer_cli/src/analyzer_impl.dart';
 import 'package:analyzer_cli/src/driver.dart';
 import 'package:analyzer_cli/src/error_formatter.dart';
 import 'package:analyzer_cli/src/options.dart';
+import 'package:protobuf/protobuf.dart';
 
 import 'message_grouper.dart';
 import 'worker_protocol.pb.dart';
 
 /**
  * Analyzer used when the "--build-mode" option is supplied.
  */
 class BuildMode {
   final CommandLineOptions options;
   final AnalysisStats stats;
@@ skipping 49 matching lines @@
       while (true) {
         AnalysisResult analysisResult = context.performAnalysisTask();
         if (!analysisResult.hasMoreWork) {
           break;
         }
       }
     }
 
     // Write summary.
     if (options.buildSummaryOutput != null) {
-      for (Source source in explicitSources) {
-        if (context.computeKindOf(source) == SourceKind.LIBRARY) {
+      if (options.buildSummaryOnlyAst && !options.buildSummaryFallback) {
+        _serializeAstBasedSummary(explicitSources);
+      } else {
+        for (Source source in explicitSources) {
+          if (context.computeKindOf(source) == SourceKind.LIBRARY) {
+            if (options.buildSummaryFallback) {
+              assembler.addFallbackLibrary(source);
+            } else {
+              LibraryElement libraryElement =
+                  context.computeLibraryElement(source);
+              assembler.serializeLibraryElement(libraryElement);
+            }
+          }
           if (options.buildSummaryFallback) {
-            assembler.addFallbackLibrary(source);
-          } else if (options.buildSummaryOnlyAst) {
-            _serializeAstBasedSummary(source);
-          } else {
-            LibraryElement libraryElement =
-                context.computeLibraryElement(source);
-            assembler.serializeLibraryElement(libraryElement);
+            assembler.addFallbackUnit(source);
           }
         }
-        if (options.buildSummaryFallback) {
-          assembler.addFallbackUnit(source);
-        }
       }
       // Write the whole package bundle.
       PackageBundleBuilder sdkBundle = assembler.assemble();
       if (options.buildSummaryExcludeInformative) {
         sdkBundle.flushInformative();
         sdkBundle.unlinkedUnitHashes = null;
       }
       io.File file = new io.File(options.buildSummaryOutput);
       file.writeAsBytesSync(sdkBundle.toBuffer(), mode: io.FileMode.WRITE_ONLY);
     }
@@ skipping 82 matching lines @@
     }
     if (outputPath == null) {
       StringSink sink = options.machineFormat ? errorSink : outSink;
       sink.write(buffer);
     } else {
       new io.File(outputPath).writeAsStringSync(buffer.toString());
     }
   }
 
   /**
-   * Serialize the library with the given [source] into [assembler] using only
-   * its AST, [UnlinkedUnit]s of input packages and ASTs (via [UnlinkedUnit]s)
-   * of package sources.
+   * Serialize the package with the given [sources] into [assembler] using only
+   * their ASTs and [LinkedUnit]s of input packages.
    */
-  void _serializeAstBasedSummary(Source source) {
-    Source resolveRelativeUri(String relativeUri) {
-      Source resolvedSource =
-          context.sourceFactory.resolveUri(source, relativeUri);
-      if (resolvedSource == null) {
-        context.sourceFactory.resolveUri(source, relativeUri);
-        throw new StateError('Could not resolve $relativeUri in the context of '
-            '$source (${source.runtimeType})');
-      }
-      return resolvedSource;
-    }
+  void _serializeAstBasedSummary(List<Source> sources) {
+    Set<String> sourceUris =
+        sources.map((Source s) => s.uri.toString()).toSet();
 
-    UnlinkedUnit _getUnlinkedUnit(Source source) {
+    LinkedLibrary _getDependency(String absoluteUri) =>
+        summaryDataStore.linkedMap[absoluteUri];
+
+    UnlinkedUnit _getUnit(String absoluteUri) {
       // Maybe an input package contains the source.
       {
-        String uriStr = source.uri.toString();
-        UnlinkedUnit unlinkedUnit = summaryDataStore.unlinkedMap[uriStr];
+        UnlinkedUnit unlinkedUnit = summaryDataStore.unlinkedMap[absoluteUri];
         if (unlinkedUnit != null) {
           return unlinkedUnit;
         }
       }
       // Parse the source and serialize its AST.
-      return uriToUnit.putIfAbsent(source.uri, () {
+      Uri uri = Uri.parse(absoluteUri);
+      Source source = context.sourceFactory.forUri2(uri);
+      return uriToUnit.putIfAbsent(uri, () {
         CompilationUnit unit = context.computeResult(source, PARSED_UNIT);
         UnlinkedUnitBuilder unlinkedUnit = serializeAstUnlinked(unit);
         assembler.addUnlinkedUnit(source, unlinkedUnit);
         return unlinkedUnit;
       });
     }
 
-    UnlinkedUnit getPart(String relativeUri) {
-      return _getUnlinkedUnit(resolveRelativeUri(relativeUri));
-    }
-
-    UnlinkedPublicNamespace getImport(String relativeUri) {
-      return getPart(relativeUri).publicNamespace;
-    }
-
-    UnlinkedUnitBuilder definingUnit = _getUnlinkedUnit(source);
-    LinkedLibraryBuilder linkedLibrary =
-        prelink(definingUnit, getPart, getImport);
-    assembler.addLinkedLibrary(source.uri.toString(), linkedLibrary);
+    Map<String, LinkedLibraryBuilder> linkResult =
+        link(sourceUris, _getDependency, _getUnit, options.strongMode);
+    linkResult.forEach(assembler.addLinkedLibrary);
   }
 
   /**
    * Convert [sourceEntities] (a list of file specifications of the form
    * "$uri|$path") to a map from URI to path.  If an error occurs, report the
    * error and return null.
    */
   static Map<Uri, JavaFile> _createUriToFileMap(List<String> sourceEntities) {
     Map<Uri, JavaFile> uriToFileMap = <Uri, JavaFile>{};
     for (String sourceFile in sourceEntities) {
       int pipeIndex = sourceFile.indexOf('|');
       if (pipeIndex == -1) {
         // TODO(paulberry): add the ability to guess the URI from the path.
         errorSink.writeln(
             'Illegal input file (must be "\$uri|\$path"): $sourceFile');
         return null;
       }
       Uri uri = Uri.parse(sourceFile.substring(0, pipeIndex));
       String path = sourceFile.substring(pipeIndex + 1);
       uriToFileMap[uri] = new JavaFile(path);
     }
     return uriToFileMap;
   }
 }
 
 /**
+ * Default implementation of [WorkerConnection] that works with stdio.
+ */
+class StdWorkerConnection implements WorkerConnection {
+  final MessageGrouper _messageGrouper;
+  final io.Stdout _stdoutStream;
+
+  StdWorkerConnection(io.Stdin stdinStream, this._stdoutStream)
+      : _messageGrouper = new MessageGrouper(stdinStream);
+
+  @override
+  WorkRequest readRequest() {
+    var buffer = _messageGrouper.next;
+    if (buffer == null) return null;
+
+    return new WorkRequest.fromBuffer(buffer);
+  }
+
+  @override
+  void writeResponse(WorkResponse response) {
+    var responseBuffer = response.writeToBuffer();
+
+    var writer = new CodedBufferWriter();
+    writer.writeInt32NoTag(responseBuffer.length);
+    writer.writeRawBytes(responseBuffer);
+
+    _stdoutStream.add(writer.toBuffer());
+  }
+}
+
+/**
  * Connection between a worker and input / output.
  */
 abstract class WorkerConnection {
   /**
    * Read a new [WorkRequest]. Returns [null] when there are no more requests.
    */
   WorkRequest readRequest();
 
   /**
    * Write the given [response] as bytes to the output.
@@ skipping 87 matching lines @@
     String msg = '';
     if (errorBuffer.isNotEmpty) {
       msg += errorBuffer.toString() + '\n';
     }
     if (outBuffer.isNotEmpty) {
       msg += outBuffer.toString() + '\n';
     }
     return msg;
   }
 }
-
-/**
- * Default implementation of [WorkerConnection] that works with stdio.
- */
-class StdWorkerConnection implements WorkerConnection {
-  final MessageGrouper _messageGrouper;
-  final io.Stdout _stdoutStream;
-
-  StdWorkerConnection(io.Stdin stdinStream, this._stdoutStream)
-      : _messageGrouper = new MessageGrouper(stdinStream);
-
-  @override
-  WorkRequest readRequest() {
-    var buffer = _messageGrouper.next;
-    if (buffer == null) return null;
-
-    return new WorkRequest.fromBuffer(buffer);
-  }
-
-  @override
-  void writeResponse(WorkResponse response) {
-    var responseBuffer = response.writeToBuffer();
-
-    var writer = new CodedBufferWriter();
-    writer.writeInt32NoTag(responseBuffer.length);
-    writer.writeRawBytes(responseBuffer);
-
-    _stdoutStream.add(writer.toBuffer());
-  }
-}