Store return types of variable initializers in summaries.

pkg/analyzer/test/src/summary/resynthesize_test.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 test.src.serialization.elements_test;
 
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ skipping 530 matching lines @@
           reason: 'Mismatch in $desc.$modifier: got $got, want $want');
     }
     // Validate members.
     if (oImpl is Member) {
       expect(rImpl, new isInstanceOf<Member>(), reason: desc);
     } else {
       expect(rImpl, isNot(new isInstanceOf<Member>()), reason: desc);
     }
   }
 
-  void compareExecutableElements(
-      ExecutableElement resynthesized, ExecutableElement original, String desc,
-      {bool compareReturnTypes: true}) {
+  void compareExecutableElements(ExecutableElement resynthesized,
+      ExecutableElement original, String desc) {
     compareElements(resynthesized, original, desc);
     compareParameterElementLists(
         resynthesized.parameters, original.parameters, desc);
-    // TODO(scheglov) remove the condition once initializers have return types.
-    if (compareReturnTypes) {
-      compareTypes(
-          resynthesized.returnType, original.returnType, '$desc return type');
-    }
+    compareTypes(
+        resynthesized.returnType, original.returnType, '$desc return type');
     compareTypes(resynthesized.type, original.type, desc);
     expect(resynthesized.typeParameters.length, original.typeParameters.length);
     for (int i = 0; i < resynthesized.typeParameters.length; i++) {
       compareTypeParameterElements(
           resynthesized.typeParameters[i],
           original.typeParameters[i],
           '$desc type parameter ${original.typeParameters[i].name}');
     }
     if (original is! Member) {
       List<FunctionElement> rFunctions = resynthesized.functions;
@@ skipping 26 matching lines @@
           resynthesized.combinators[i], original.combinators[i]);
     }
   }
 
   void compareFieldElements(
       FieldElementImpl resynthesized, FieldElementImpl original, String desc) {
     comparePropertyInducingElements(resynthesized, original, desc);
   }
 
   void compareFunctionElements(
-      FunctionElement resynthesized, FunctionElement original, String desc,
-      {bool compareReturnTypes: true}) {
+      FunctionElement resynthesized, FunctionElement original, String desc) {
     if (original == null && resynthesized == null) {
       return;
     }
     expect(resynthesized, isNotNull, reason: desc);
-    compareExecutableElements(resynthesized, original, desc,
-        compareReturnTypes: compareReturnTypes);
+    compareExecutableElements(resynthesized, original, desc);
     checkPossibleLocalElements(resynthesized, original);
   }
 
   void compareFunctionTypeAliasElements(
       FunctionTypeAliasElementImpl resynthesized,
       FunctionTypeAliasElementImpl original,
       String desc) {
     compareElements(resynthesized, original, desc);
     compareParameterElementLists(
         resynthesized.parameters, original.parameters, desc);
@@ skipping 220 matching lines @@
         compareTypeParameterElements(resynthesized.typeFormals[i],
             original.typeFormals[i], '$desc bound type parameter $i');
       }
     } else if (resynthesized is VoidTypeImpl && original is VoidTypeImpl) {
       expect(resynthesized, same(original));
     } else if (resynthesized is DynamicTypeImpl &&
         original is UndefinedTypeImpl) {
       // TODO(scheglov) In the strong mode constant variable like
       //  `var V = new Unresolved()` gets `UndefinedTypeImpl`, and it gets
       // `DynamicTypeImpl` in the spec mode.
+    } else if (resynthesized is BottomTypeImpl && original is BottomTypeImpl) {
+      expect(resynthesized, same(original));
     } else if (resynthesized.runtimeType != original.runtimeType) {
       fail('Type mismatch: expected ${original.runtimeType},'
           ' got ${resynthesized.runtimeType} ($desc)');
     } else {
       fail('Unimplemented comparison for ${original.runtimeType}');
     }
   }
 
   void compareUriReferencedElements(UriReferencedElementImpl resynthesized,
       UriReferencedElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
     expect(resynthesized.uri, original.uri);
     expect(resynthesized.uriOffset, original.uriOffset, reason: desc);
     expect(resynthesized.uriEnd, original.uriEnd, reason: desc);
   }
 
   void compareVariableElements(
       VariableElement resynthesized, VariableElement original, String desc) {
     compareElements(resynthesized, original, desc);
     compareTypes(resynthesized.type, original.type, desc);
     // TODO(scheglov) VariableMember.initializer is not implemented
     if (original is! VariableMember) {
       compareFunctionElements(
-          resynthesized.initializer, original.initializer, desc,
-          compareReturnTypes: false);
+          resynthesized.initializer, original.initializer, desc);
     }
     VariableElementImpl originalActual = getActualElement(original, desc);
     if (originalActual is ConstVariableElement) {
       VariableElementImpl resynthesizedActual =
           getActualElement(resynthesized, desc);
       Expression initializer = resynthesizedActual.constantInitializer;
       if (constantInitializersAreInvalid) {
         _assertUnresolvedIdentifier(initializer, desc);
       } else {
         compareConstAsts(initializer, originalActual.constantInitializer,
@@ skipping 2801 matching lines @@
       fail('Unexpectedly tried to get unlinked summary for $uri');
     }
     return serializedUnit;
   }
 
   @override
   bool hasLibrarySummary(String uri) {
     return true;
   }
 }