Set LibraryElement.entryPoint properly during summary resynthesis.

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 655 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;
-    populateUnit(definingCompilationUnit, 0);
+    FunctionElement entryPoint = populateUnit(definingCompilationUnit, 0);
     for (int i = 0; i < parts.length; i++) {
-      populateUnit(parts[i], i + 1);
+      FunctionElement unitEntryPoint = populateUnit(parts[i], i + 1);

[scheglov, 2016/01/08 06:17:44]

We need to check also exported libraries.

18.4 Scripts scripts:  A script is a library whose exported namespace (18.2)
includes a top-level
member named main.

[Paul Berry, 2016/01/08 18:25:57]

Oops, good catch!  I've added failing tests and a TODO comment, and I'll address
this in a follow-up CL.

+      if (entryPoint == null) {
+        entryPoint = unitEntryPoint;
+      }
     }
+    libraryElement.entryPoint = entryPoint;
     if (isCoreLibrary) {
       ClassElement objectElement = libraryElement.getType('Object');
       assert(objectElement != null);
       for (ClassElementImpl classElement in delayedObjectSubclasses) {
         classElement.supertype = objectElement.type;
       }
     }
     return libraryElement;
   }
 
@@ skipping 233 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.
    */
-  void populateUnit(CompilationUnitElementImpl unit, int unitNum) {
+  FunctionElement 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.name == 'main') {

[scheglov, 2016/01/08 06:17:44]

Or could also use `function.isEntryPoint` instead.

[Paul Berry, 2016/01/08 18:25:57]

Done.

+        entryPoint = function;
+        break;
+      }
+    }
     resummarizedElements[absoluteUri] = elementMap;
     unitHolder = null;
     prelinkedUnit = null;
     unlinkedUnit = null;
+    return entryPoint;
   }
 }