Compute exportNamespace during resynthesizing.

pkg/analyzer/lib/src/summary/resynthesize.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 summary_resynthesizer;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/element_handle.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ skipping 673 matching lines @@
     }
     libraryElement.imports = imports;
     List<ExportElement> exports = <ExportElement>[];
     assert(unlinkedDefiningUnit.exports.length ==
         unlinkedDefiningUnit.publicNamespace.exports.length);
     for (int i = 0; i < unlinkedDefiningUnit.exports.length; i++) {
       exports.add(buildExport(unlinkedDefiningUnit.publicNamespace.exports[i],
           unlinkedDefiningUnit.exports[i]));
     }
     libraryElement.exports = exports;
-    FunctionElement entryPoint = populateUnit(definingCompilationUnit, 0);
+    populateUnit(definingCompilationUnit, 0);
     for (int i = 0; i < parts.length; i++) {
-      FunctionElement unitEntryPoint = populateUnit(parts[i], i + 1);
-      if (entryPoint == null) {
-        entryPoint = unitEntryPoint;
-      }
+      populateUnit(parts[i], i + 1);
     }
-    // TODO(paulberry): also look for entry points in exports.
-    libraryElement.entryPoint = entryPoint;
     if (isCoreLibrary) {
       ClassElement objectElement = libraryElement.getType('Object');
       assert(objectElement != null);
       for (ClassElementImpl classElement in delayedObjectSubclasses) {
         classElement.supertype = objectElement.type;
       }
     }
-    // Compute public namespace.
+    // Compute namespaces.
     libraryElement.publicNamespace =
         new NamespaceBuilder().createPublicNamespaceForLibrary(libraryElement);
+    libraryElement.exportNamespace =

[Paul Berry, 2016/01/11 23:33:40]

Please add:

// TODO(paulberry): compute the export namespace from prelinked data, so that
exported libraries won't be unnecessarily resynthesized.

+        new NamespaceBuilder().createExportNamespaceForLibrary(libraryElement);
+    // Find the entry point.
+    libraryElement.entryPoint =
+        libraryElement.exportNamespace.definedNames.values.firstWhere(
+            (element) => element is FunctionElement && element.isEntryPoint,
+            orElse: () => null);
     // Done.
     return libraryElement;
   }
 
   /**
    * Resynthesize a [ParameterElement].
    */
   ParameterElement buildParameter(UnlinkedParam serializedParameter) {
     ParameterElementImpl parameterElement = new ParameterElementImpl(
         serializedParameter.name, serializedParameter.nameOffset);
@@ skipping 231 matching lines @@
   void finishTypeParameter(UnlinkedTypeParam serializedTypeParameter,
       TypeParameterElementImpl typeParameterElement) {
     if (serializedTypeParameter.bound != null) {
       typeParameterElement.bound = buildType(serializedTypeParameter.bound);
     }
   }
 
   /**
    * Populate a [CompilationUnitElement] by deserializing all the elements
    * contained in it.
-   *
-   * If the compilation unit has an entry point, it is returned.
    */
-  FunctionElement populateUnit(CompilationUnitElementImpl unit, int unitNum) {
+  void populateUnit(CompilationUnitElementImpl unit, int unitNum) {
     prelinkedUnit = prelinkedLibrary.units[unitNum];
     unlinkedUnit = unlinkedUnits[unitNum];
     unitHolder = new ElementHolder();
     unlinkedUnit.classes.forEach(buildClass);
     unlinkedUnit.enums.forEach(buildEnum);
     unlinkedUnit.executables.forEach(buildExecutable);
     unlinkedUnit.typedefs.forEach(buildTypedef);
     unlinkedUnit.variables.forEach(buildVariable);
     String absoluteUri = unit.source.uri.toString();
     unit.accessors = unitHolder.accessors;
@@ skipping 11 matching lines @@
     Map<String, Element> elementMap = <String, Element>{};
     for (ClassElement cls in unit.types) {
       elementMap[cls.name] = cls;
     }
     for (ClassElement cls in unit.enums) {
       elementMap[cls.name] = cls;
     }
     for (FunctionTypeAliasElement typeAlias in unit.functionTypeAliases) {
       elementMap[typeAlias.name] = typeAlias;
     }
-    FunctionElement entryPoint = null;
-    for (FunctionElement function in unit.functions) {
-      if (function.isEntryPoint) {
-        entryPoint = function;
-        break;
-      }
-    }
     resummarizedElements[absoluteUri] = elementMap;
     unitHolder = null;
     prelinkedUnit = null;
     unlinkedUnit = null;
-    return entryPoint;
   }
 }