Rebased and retested version of CL 1915123008.

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 737 matching lines @@
 abstract class FunctionTypedElementMixin
     implements FunctionElement, DeserializedElementZ {
   @override
   FunctionElement asFunctionElement() => this;
 
   @override
   bool get isExternal {
     return _decoder.getBool(Key.IS_EXTERNAL,
         isOptional: true, defaultValue: false);
   }
+
+  @override
+  List<DartType> get typeVariables => functionSignature.typeVariables;
 }
 
 abstract class ClassElementMixin implements ElementZ, ClassElement {
   InterfaceType _createType(List<DartType> typeArguments) {
     return new InterfaceType(this, typeArguments);
   }
 
   @override
   ElementKind get kind => ElementKind.CLASS;
 
@@ skipping 556 matching lines @@
 
   @override
   SourceSpan get sourcePosition => enclosingClass.sourcePosition;
 
   @override
   FunctionType get type {
     // TODO(johnniwinther): Ensure that the function type substitutes type
     // variables correctly.
     return definingConstructor.type;
   }
+
+  @override
+  List<DartType> get typeVariables => _unsupported("typeVariables");
 }
 
 abstract class MemberElementMixin
     implements DeserializedElementZ, MemberElement {
   @override
   MemberElement get memberContext => this;
 
   @override
   Name get memberName => new Name(name, library);
 
@@ skipping 524 matching lines @@
   bool get isNamed => _decoder.getBool(Key.IS_NAMED);
 
   @override
   bool get isOptional => _decoder.getBool(Key.IS_OPTIONAL);
 
   @override
   LibraryElement get library => executableContext.library;
 
   @override
   MemberElement get memberContext => executableContext.memberContext;
+
+  @override
+  List<DartType> get typeVariables => functionSignature.typeVariables;
 }
 
 class LocalParameterElementZ extends ParameterElementZ
     implements LocalParameterElement {
   LocalParameterElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   accept(ElementVisitor visitor, arg) {
     return visitor.visitParameterElement(this, arg);
   }
@@ skipping 199 matching lines @@
   }
 
   @override
   ElementKind get kind => ElementKind.PREFIX;
 
   @override
   Element lookupLocalMember(String memberName) {
     return _unsupported('lookupLocalMember');
   }
 }