Fix summarization of generic redirecting constructors (again).

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/member.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/idl.dart';
 import 'package:analyzer/src/summary/name_filter.dart';
 import 'package:analyzer/src/summary/summarize_const_expr.dart';
 
 /**
@@ skipping 511 matching lines @@
     if (executableElement is PropertyAccessorElement) {
       if (executableElement.isGetter) {
         b.kind = UnlinkedExecutableKind.getter;
       } else {
         b.kind = UnlinkedExecutableKind.setter;
       }
     } else if (executableElement is ConstructorElementImpl) {
       b.kind = UnlinkedExecutableKind.constructor;
       b.isConst = executableElement.isConst;
       b.isFactory = executableElement.isFactory;
-      if (executableElement.redirectedConstructor != null) {
+      ConstructorElement redirectedConstructor =
+          executableElement.redirectedConstructor;
+      if (redirectedConstructor != null) {
         b.isRedirectedConstructor = true;
         if (executableElement.isFactory) {
-          EntityRefBuilder typeRef = serializeTypeRef(
-              executableElement.redirectedConstructor.enclosingElement.type,
-              executableElement.redirectedConstructor.enclosingElement);
-          if (executableElement.redirectedConstructor.name.isNotEmpty) {
-            String name = executableElement.redirectedConstructor.name;
+          InterfaceType returnType = redirectedConstructor is ConstructorMember
+              ? redirectedConstructor.definingType
+              : redirectedConstructor.enclosingElement.type;
+          EntityRefBuilder typeRef =
+              serializeTypeRef(returnType, executableElement);
+          if (redirectedConstructor.name.isNotEmpty) {
+            String name = redirectedConstructor.name;
             int typeId = typeRef.reference;
             LinkedReference typeLinkedRef = linkedReferences[typeId];
             unlinkedReferences.add(new UnlinkedReferenceBuilder(
                 name: name, prefixReference: typeId));
             int refId = linkedReferences.length;
             linkedReferences.add(new LinkedReferenceBuilder(
                 kind: ReferenceKind.constructor, unit: typeLinkedRef.unit));
             b.redirectedConstructor = new EntityRefBuilder(
                 reference: refId, typeArguments: typeRef.typeArguments);
           } else {
             b.redirectedConstructor = typeRef;
           }
         } else {
-          b.redirectedConstructorName =
-              executableElement.redirectedConstructor.name;
+          b.redirectedConstructorName = redirectedConstructor.name;
         }
       }
       if (executableElement.isConst &&
           executableElement.constantInitializers != null) {
         Set<String> constructorParameterNames =
             executableElement.parameters.map((p) => p.name).toSet();
         b.constantInitializers = executableElement.constantInitializers
             .map((ConstructorInitializer initializer) =>
                 serializeConstructorInitializer(
                     initializer,
@@ skipping 705 matching lines @@
       exportNames.add(new LinkedExportNameBuilder(
           name: name,
           dependency: serializeDependency(dependentLibrary),
           unit: unit,
           kind: kind));
     }
     pb.exportNames = exportNames;
     return pb;
   }
 }