Serialize references to type parameters in final fields.

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 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ skipping 487 matching lines @@
 
   /**
    * Serialize annotations from the given [element].  If [element] has no
    * annotations, the empty list is returned.
    */
   List<UnlinkedConstBuilder> serializeAnnotations(Element element) {
     if (element.metadata.isEmpty) {
       return const <UnlinkedConstBuilder>[];
     }
     return element.metadata.map((ElementAnnotationImpl a) {
-      _ConstExprSerializer serializer = new _ConstExprSerializer(this, null);
+      _ConstExprSerializer serializer =
+          new _ConstExprSerializer(this, element, null);
       serializer.serializeAnnotation(a.annotationAst);
       return serializer.toBuilder();
     }).toList();
   }
 
   /**
    * Return the index of the entry in the references table
    * ([LinkedLibrary.references]) used for the "bottom" type.  A new entry is
    * added to the table if necessary to satisfy the request.
    */
@@ skipping 125 matching lines @@
       b.end = combinator.end;
     } else if (combinator is HideElementCombinator) {
       b.hides = combinator.hiddenNames;
     }
     return b;
   }
 
   /**
    * Serialize the given [expression], creating an [UnlinkedConstBuilder].
    */
-  UnlinkedConstBuilder serializeConstExpr(Expression expression,
+  UnlinkedConstBuilder serializeConstExpr(
+      Element context, Expression expression,
       [Set<String> constructorParameterNames]) {
     _ConstExprSerializer serializer =
-        new _ConstExprSerializer(this, constructorParameterNames);
+        new _ConstExprSerializer(this, context, constructorParameterNames);
     serializer.serialize(expression);
     return serializer.toBuilder();
   }
 
   /**
    * Serialize documentation from the given [element], creating an
    * [UnlinkedDocumentationComment].
    *
    * If [element] has no documentation, `null` is returned.
    */
@@ skipping 94 matching lines @@
       }
       if (executableElement.isConst) {
         b.constCycleSlot = storeConstCycle(!executableElement.isCycleFree);
         if (executableElement.constantInitializers != null) {
           Set<String> constructorParameterNames =
               executableElement.parameters.map((p) => p.name).toSet();
           b.constantInitializers = executableElement.constantInitializers
               .map((ConstructorInitializer initializer) =>
                   serializeConstructorInitializer(
                       initializer,
-                      (expr) =>
-                          serializeConstExpr(expr, constructorParameterNames)))
+                      (expr) => serializeConstExpr(
+                          executableElement, expr, constructorParameterNames)))
               .toList();
         }
       }
     } else {
       b.kind = UnlinkedExecutableKind.functionOrMethod;
     }
     b.isAbstract = executableElement.isAbstract;
     b.isStatic = executableElement.isStatic &&
         executableElement.enclosingElement is ClassElement;
     b.isExternal = executableElement.isExternal;
@@ skipping 115 matching lines @@
             .map((parameter) => serializeParam(parameter, context))
             .toList();
       } else {
         b.type = serializeTypeRef(type, context);
       }
     }
     if (parameter is ConstVariableElement) {
       ConstVariableElement constParameter = parameter as ConstVariableElement;
       Expression initializer = constParameter.constantInitializer;
       if (initializer != null) {
-        b.defaultValue = serializeConstExpr(initializer);
+        b.defaultValue = serializeConstExpr(parameter, initializer);
         b.defaultValueCode = parameter.defaultValueCode;
       }
     }
     // TODO(scheglov) VariableMember.initializer is not implemented
     if (parameter is! VariableMember && parameter.initializer != null) {
       b.initializer = serializeExecutable(parameter.initializer);
     }
     {
       SourceRange visibleRange = parameter.visibleRange;
       if (visibleRange != null) {
@@ skipping 193 matching lines @@
     }
     b.isStatic = variable.isStatic && variable.enclosingElement is ClassElement;
     b.isFinal = variable.isFinal;
     b.isConst = variable.isConst;
     b.documentationComment = serializeDocumentation(variable);
     b.annotations = serializeAnnotations(variable);
     if (variable is ConstVariableElement) {
       ConstVariableElement constVariable = variable as ConstVariableElement;
       Expression initializer = constVariable.constantInitializer;
       if (initializer != null) {
-        b.constExpr = serializeConstExpr(initializer);
+        b.constExpr = serializeConstExpr(variable, initializer);
       }
     }
     if (variable is PropertyInducingElement) {
       if (b.isFinal || b.isConst) {
         b.propagatedTypeSlot =
             storeLinkedType(variable.propagatedType, variable);
       } else {
         // Variable is not propagable.
         assert(variable.propagatedType == null);
       }
@@ skipping 143 matching lines @@
         prefixReference: prefix);
   }
 }
 
 /**
  * Instances of this class keep track of intermediate state during
  * serialization of a single constant [Expression].
  */
 class _ConstExprSerializer extends AbstractConstExprSerializer {
   final _CompilationUnitSerializer serializer;
+  final Element context;
 
   /**
    * If a constructor initializer expression is being serialized, the names of
    * the constructor parameters.  Otherwise `null`.
    */
   final Set<String> constructorParameterNames;
 
-  _ConstExprSerializer(this.serializer, this.constructorParameterNames);
+  _ConstExprSerializer(
+      this.serializer, this.context, this.constructorParameterNames);
 
   @override
   bool isConstructorParameterName(String name) {
     return constructorParameterNames?.contains(name) ?? false;
   }
 
   @override
   void serializeAnnotation(Annotation annotation) {
     if (annotation.arguments == null) {
       assert(annotation.constructorName == null);
@@ skipping 110 matching lines @@
 
   @override
   EntityRefBuilder serializeType(TypeName typeName) {
     if (typeName != null) {
       DartType type = typeName.type;
       if (type == null || type.isUndefined) {
         return serializeIdentifier(typeName.name);
       }
     }
     DartType type = typeName != null ? typeName.type : DynamicTypeImpl.instance;
-    return serializer.serializeTypeRef(type, null);
+    return serializer.serializeTypeRef(type, context);
   }
 }
 
 /**
  * Instances of this class keep track of intermediate state during
  * serialization of a single library.
  */
 class _LibrarySerializer {
   /**
    * The library to be serialized.
@@ skipping 180 matching lines @@
       exportNames.add(new LinkedExportNameBuilder(
           name: name,
           dependency: serializeDependency(dependentLibrary),
           unit: unit,
           kind: kind));
     }
     pb.exportNames = exportNames;
     return pb;
   }
 }