Eliminate constructor return types from summaries.

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 228 matching lines @@
           serializedClass.interfaces.map(buildType).toList();
       classElement.mixins = serializedClass.mixins.map(buildType).toList();
       classElement.typeParameters = currentTypeParameters;
       ElementHolder memberHolder = new ElementHolder();
       bool constructorFound = false;
       for (UnlinkedExecutable serializedExecutable
           in serializedClass.executables) {
         switch (serializedExecutable.kind) {
           case UnlinkedExecutableKind.constructor:
             constructorFound = true;
-            buildConstructor(serializedExecutable, memberHolder);
+            buildConstructor(
+                serializedExecutable, memberHolder, correspondingType);
             break;
           case UnlinkedExecutableKind.functionOrMethod:
           case UnlinkedExecutableKind.getter:
           case UnlinkedExecutableKind.setter:
             buildExecutable(serializedExecutable, memberHolder);
             break;
         }
       }
       for (UnlinkedVariable serializedVariable in serializedClass.fields) {
         buildVariable(serializedVariable, memberHolder);
@@ skipping 41 matching lines @@
       HideElementCombinatorImpl combinator = new HideElementCombinatorImpl();
       // Note: we call toList() so that we don't retain a reference to the
       // deserialized data structure.
       combinator.hiddenNames = serializedCombinator.hides.toList();
       return combinator;
     }
   }
 
   /**
    * Resynthesize a [ConstructorElement] and place it in the given [holder].
+   * [classType] is the type of the class for which this element is a
+   * constructor.
    */
-  void buildConstructor(
-      UnlinkedExecutable serializedExecutable, ElementHolder holder) {
+  void buildConstructor(UnlinkedExecutable serializedExecutable,
+      ElementHolder holder, InterfaceType classType) {
     assert(serializedExecutable.kind == UnlinkedExecutableKind.constructor);
     ConstructorElementImpl constructorElement =
         new ConstructorElementImpl(serializedExecutable.name, -1);
+    constructorElement.returnType = classType;
     buildExecutableCommonParts(constructorElement, serializedExecutable);
     constructorElement.factory = serializedExecutable.isFactory;
     constructorElement.const2 = serializedExecutable.isConst;
     holder.addConstructor(constructorElement);
   }
 
   /**
    * Resynthesize the [ClassElement] corresponding to an enum, along with the
    * associated fields and implicit accessors.
    */
@@ skipping 115 matching lines @@
   /**
    * Handle the parts of an executable element that are common to constructors,
    * functions, methods, getters, and setters.
    */
   void buildExecutableCommonParts(ExecutableElementImpl executableElement,
       UnlinkedExecutable serializedExecutable) {
     executableElement.parameters =
         serializedExecutable.parameters.map(buildParameter).toList();
     if (serializedExecutable.returnType != null) {
       executableElement.returnType = buildType(serializedExecutable.returnType);
+    } else if (serializedExecutable.kind ==
+        UnlinkedExecutableKind.constructor) {
+      // Return type was set by the caller.
     } else {
       executableElement.returnType = VoidTypeImpl.instance;
     }
     executableElement.type = new FunctionTypeImpl.elementWithNameAndArgs(
         executableElement,
         null,
         currentTypeParameters
             ?.map((TypeParameterElement e) => e.type)
             ?.toList());
     executableElement.hasImplicitReturnType =
@@ skipping 455 matching lines @@
     }
     for (FunctionTypeAliasElement typeAlias in unit.functionTypeAliases) {
       elementMap[typeAlias.name] = typeAlias;
     }
     resummarizedElements[absoluteUri] = elementMap;
     unitHolder = null;
     prelinkedUnit = null;
     unlinkedUnit = null;
   }
 }