Support serialization of generic methods.

pkg/compiler/lib/src/serialization/modelz.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.
 
 /// Implementation of the element model used for deserialiation.
 ///
 /// These classes are created by [ElementDeserializer] triggered by the
 /// [Deserializer].
 
 library dart2js.serialization.modelz;
@@ skipping 770 matching lines @@
         namedParameters = <String>[];
         namedParameterTypes = <DartType>[];
         orderedOptionalParameters.sort((Element a, Element b) {
           return a.name.compareTo(b.name);
         });
         for (ParameterElement parameter in orderedOptionalParameters) {
           namedParameters.add(parameter.name);
           namedParameterTypes.add(parameter.type);
         }
       }
+      List<DartType> typeVariables =
+          _decoder.getTypes(Key.TYPE_VARIABLES, isOptional: true);
 
       FunctionType type = new FunctionType(
           this,
           _decoder.getType(Key.RETURN_TYPE),
           parameterTypes,
           optionalParameterTypes,
           namedParameters,
           namedParameterTypes);
       _functionSignature = new FunctionSignatureX(
+          typeVariables: typeVariables,
           requiredParameters: requiredParameters,
           requiredParameterCount: requiredParameterCount,
           optionalParameters: optionalParameters,
           optionalParameterCount: optionalParameterCount,
           optionalParametersAreNamed: optionalParametersAreNamed,
           orderedOptionalParameters: orderedOptionalParameters,
           type: type);
     }
     return _functionSignature;
   }
@@ skipping 1056 matching lines @@
   @override
   void ensureResolved(Resolution resolution) {}
 
   @override
   void checkCyclicReference(Resolution resolution) {}
 }
 
 class TypeVariableElementZ extends DeserializedElementZ
     with AnalyzableElementMixin, AstElementMixinZ, TypedElementMixin
     implements TypeVariableElement {
-  TypeDeclarationElement _typeDeclaration;
+  GenericElement _typeDeclaration;
   TypeVariableType _type;
   DartType _bound;
   Name _memberName;
 
   TypeVariableElementZ(ObjectDecoder decoder) : super(decoder);
 
   Name get memberName {
     if (_memberName == null) {
       _memberName = new Name(name, library);
     }
@@ skipping 16 matching lines @@
   @override
   Element get enclosingElement => typeDeclaration;
 
   @override
   Element get enclosingClass => typeDeclaration;
 
   @override
   int get index => _decoder.getInt(Key.INDEX);
 
   @override
-  TypeDeclarationElement get typeDeclaration {
+  GenericElement get typeDeclaration {
     if (_typeDeclaration == null) {
       _typeDeclaration = _decoder.getElement(Key.TYPE_DECLARATION);
     }
     return _typeDeclaration;
   }
 
   DartType get bound {
     if (_bound == null) {
       _bound = _decoder.getType(Key.BOUND);
     }
@@ skipping 393 matching lines @@
   }
 
   @override
   Node get node => throw new UnsupportedError('${this}.node');
 
   @override
   bool get hasNode => false;
 
   String toString() => 'MetadataAnnotationZ(${constant.toDartText()})';
 }