Store the result of type inference in summaries.

pkg/analyzer/lib/src/summary/summarize_elements.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 serialization.elements;
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/name_filter.dart';
 import 'package:analyzer/src/summary/summarize_const_expr.dart';
 
 /**
  * Serialize all the elements in [lib] to a summary using [ctx] as the context
  * for building the summary, and using [typeProvider] to find built-in types.
  */
 LibrarySerializationResult serializeLibrary(
-    LibraryElement lib, TypeProvider typeProvider) {
-  var serializer = new _LibrarySerializer(lib, typeProvider);
+    LibraryElement lib, TypeProvider typeProvider, bool strongMode) {
+  var serializer = new _LibrarySerializer(lib, typeProvider, strongMode);
   LinkedLibraryBuilder linked = serializer.serializeLibrary();
   return new LibrarySerializationResult(
       linked, serializer.unlinkedUnits, serializer.unitUris);
 }
 
 ReferenceKind _getReferenceKind(Element element) {
   ReferenceKind kind;
   if (element is PropertyAccessorElement) {
     kind = ReferenceKind.topLevelPropertyAccessor;
   } else if (element is FunctionTypeAliasElement) {
@@ skipping 398 matching lines @@
   }
 
   /**
    * Serialize the given [executableElement], creating an [UnlinkedExecutable].
    */
   UnlinkedExecutableBuilder serializeExecutable(
       ExecutableElement executableElement) {
     UnlinkedExecutableBuilder b = new UnlinkedExecutableBuilder();
     b.name = executableElement.name;
     b.nameOffset = executableElement.nameOffset;
-    if (executableElement is! ConstructorElement &&
-        !executableElement.hasImplicitReturnType) {
-      b.returnType = serializeTypeRef(
-          executableElement.type.returnType, executableElement);
+    if (executableElement is! ConstructorElement) {
+      if (!executableElement.hasImplicitReturnType) {
+        b.returnType = serializeTypeRef(
+            executableElement.type.returnType, executableElement);
+      } else if (!executableElement.isStatic) {
+        b.inferredReturnTypeSlot =
+            storeInferredType(executableElement.returnType, executableElement);
+      }
     }
     b.typeParameters =
         executableElement.typeParameters.map(serializeTypeParam).toList();
     b.parameters =
         executableElement.type.parameters.map(serializeParam).toList();
     if (executableElement is PropertyAccessorElement) {
       if (executableElement.isGetter) {
         b.kind = UnlinkedExecutableKind.getter;
       } else {
         b.kind = UnlinkedExecutableKind.setter;
@@ skipping 74 matching lines @@
         break;
       case ParameterKind.POSITIONAL:
         b.kind = UnlinkedParamKind.positional;
         break;
       case ParameterKind.NAMED:
         b.kind = UnlinkedParamKind.named;
         break;
     }
     b.isInitializingFormal = parameter.isInitializingFormal;
     DartType type = parameter.type;
-    if (!parameter.hasImplicitType) {
+    if (parameter.hasImplicitType) {
+      Element contextParent = context.enclosingElement;
+      if (!parameter.isInitializingFormal &&
+          contextParent is ExecutableElement &&
+          !contextParent.isStatic &&
+          contextParent is! ConstructorElement) {
+        b.inferredTypeSlot = storeInferredType(type, context);
+      }
+    } else {
       if (type is FunctionType) {
         b.isFunctionTyped = true;
         b.type = serializeTypeRef(type.returnType, parameter);
         b.parameters = type.parameters
             .map((parameter) => serializeParam(parameter, context))
             .toList();
       } else {
         b.type = serializeTypeRef(type, context);
       }
     }
@@ skipping 143 matching lines @@
       if (initializer != null) {
         b.constExpr = serializeConstExpr(initializer);
       }
     }
     if (b.isFinal || b.isConst) {
       b.propagatedTypeSlot = storeLinkedType(variable.propagatedType, variable);
     } else {
       // Variable is not propagable.
       assert(variable.propagatedType == null);
     }
+    if (variable.hasImplicitType &&
+        (variable.initializer != null || !variable.isStatic)) {
+      b.inferredTypeSlot = storeInferredType(variable.type, variable);
+    }
     return b;
   }
 
   /**
+   * Create a slot id for the given [type] (which is an inferred type).  If
+   * strong mode is enabled and [type] is not `dynamic`, it is stored in
+   * [linkedTypes] so that once the compilation unit has been fully visited, it
+   * will be serialized into [LinkedUnit.types].
+   *
+   * [context] is the element within which the slot id will appear; this is
+   * used to serialize type parameters.
+   */
+  int storeInferredType(DartType type, Element context) {
+    return storeLinkedType(
+        librarySerializer.strongMode && !type.isDynamic ? type : null, context);
+  }
+
+  /**
    * Create a slot id for the given [type] (which may be either a propagated
    * type or an inferred type).  If [type] is not `null`, it is stored in
    * [linkedTypes] so that once the compilation unit has been fully visited,
    * it will be serialized to [LinkedUnit.types].
    *
    * [context] is the element within which the slot id will appear; this is
    * used to serialize type parameters.
    */
   int storeLinkedType(DartType type, Element context) {
     int slot = ++numSlots;
@@ skipping 86 matching lines @@
    * The library to be serialized.
    */
   final LibraryElement libraryElement;
 
   /**
    * The type provider.  This is used to locate the library for `dart:core`.
    */
   final TypeProvider typeProvider;
 
   /**
+   * Indicates whether the element model being serialized was analyzed using
+   * strong mode.
+   */
+  final bool strongMode;
+
+  /**
    * Map from [LibraryElement] to the index of the entry in the "dependency
    * table" that refers to it.
    */
   final Map<LibraryElement, int> dependencyMap = <LibraryElement, int>{};
 
   /**
    * The "dependency table".  This is the list of objects which should be
    * written to [LinkedLibrary.dependencies].
    */
   final List<LinkedDependencyBuilder> dependencies =
@@ skipping 17 matching lines @@
    * element; elements for which no prefix is needed are absent from this map.
    */
   final Map<Element, PrefixElement> prefixMap = <Element, PrefixElement>{};
 
   /**
    * List of serializers for the compilation units constituting this library.
    */
   final List<_CompilationUnitSerializer> compilationUnitSerializers =
       <_CompilationUnitSerializer>[];
 
-  _LibrarySerializer(this.libraryElement, this.typeProvider) {
+  _LibrarySerializer(this.libraryElement, this.typeProvider, this.strongMode) {
     dependencies.add(new LinkedDependencyBuilder());
     dependencyMap[libraryElement] = 0;
   }
 
   /**
    * Retrieve a list of the URIs for the compilation units in the library.
    */
   List<String> get unitUris => compilationUnitSerializers
       .map((_CompilationUnitSerializer s) => s.unitUri)
       .toList();
@@ skipping 110 matching lines @@
       exportNames.add(new LinkedExportNameBuilder(
           name: name,
           dependency: serializeDependency(dependentLibrary),
           unit: unit,
           kind: kind));
     }
     pb.exportNames = exportNames;
     return pb;
   }
 }