Rebased and retested version of CL 1915123008.

pkg/compiler/lib/src/tree/nodes.dart

 // Copyright (c) 2012, 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.
 
 import 'dart:collection' show IterableMixin;
 
 import '../common.dart';
 import '../elements/elements.dart' show MetadataAnnotation;
 import '../resolution/secret_tree_element.dart'
     show NullTreeElementMixin, StoredTreeElementMixin;
@@ skipping 1058 matching lines @@
 
   /// Is `true` if this modifier is either `async` or `async*`.
   bool get isAsynchronous => asyncToken.value == 'async';
 
   /// Is `true` if this modifier is either `sync*` or `async*`.
   bool get isYielding => starToken != null;
 }
 
 class FunctionExpression extends Expression with StoredTreeElementMixin {
   final Node name;
+  final NodeList typeVariables;
 
   /**
    * List of VariableDefinitions or NodeList.
    *
    * A NodeList can only occur at the end and holds named parameters.
    */
   final NodeList parameters;
 
   final Statement body;
   final TypeAnnotation returnType;
   final Modifiers modifiers;
   final NodeList initializers;
 
   final Token getOrSet;
   final AsyncModifier asyncModifier;
 
-  FunctionExpression(this.name, this.parameters, this.body, this.returnType,
-      this.modifiers, this.initializers, this.getOrSet, this.asyncModifier) {
+  FunctionExpression(
+      this.name,
+      this.typeVariables,
+      this.parameters,
+      this.body,
+      this.returnType,
+      this.modifiers,
+      this.initializers,
+      this.getOrSet,
+      this.asyncModifier) {
     assert(modifiers != null);
   }
 
   FunctionExpression asFunctionExpression() => this;
 
   accept(Visitor visitor) => visitor.visitFunctionExpression(this);
 
   accept1(Visitor1 visitor, arg) => visitor.visitFunctionExpression(this, arg);
 
   bool get isRedirectingFactory {
     return body != null && body.asRedirectingFactoryBody() != null;
   }
 
   visitChildren(Visitor visitor) {
     if (modifiers != null) modifiers.accept(visitor);
     if (returnType != null) returnType.accept(visitor);
     if (name != null) name.accept(visitor);
+    if (typeVariables != null) typeVariables.accept(visitor);
     if (parameters != null) parameters.accept(visitor);
     if (initializers != null) initializers.accept(visitor);
     if (asyncModifier != null) asyncModifier.accept(visitor);
     if (body != null) body.accept(visitor);
   }
 
   visitChildren1(Visitor1 visitor, arg) {
     if (modifiers != null) modifiers.accept1(visitor, arg);
     if (returnType != null) returnType.accept1(visitor, arg);
     if (name != null) name.accept1(visitor, arg);
+    if (typeVariables != null) typeVariables.accept1(visitor, arg);
     if (parameters != null) parameters.accept1(visitor, arg);
     if (initializers != null) initializers.accept1(visitor, arg);
     if (asyncModifier != null) asyncModifier.accept1(visitor, arg);
     if (body != null) body.accept1(visitor, arg);
   }
 
   bool get hasBody => body.asEmptyStatement() == null;
 
   bool get hasEmptyBody {
     Block block = body.asBlock();
@@ skipping 1961 matching lines @@
   accept1(Visitor1 visitor, arg) {}
 
   visitChildren(Visitor visitor) {}
 
   visitChildren1(Visitor1 visitor, arg) {}
 
   bool get isErroneous => true;
 
   // FunctionExpression.
   get asyncModifier => null;
+  get typeVariables => null;
   get parameters => null;
   get body => null;
   get returnType => null;
   get modifiers => Modifiers.EMPTY;
   get initializers => null;
   get getOrSet => null;
   get isRedirectingFactory => false;
   bool get hasBody => false;
   bool get hasEmptyBody => false;
 
   // VariableDefinitions.
   get metadata => null;
   get type => null;
 
   // Typedef.
   get typeParameters => null;
   get formals => null;
   get typedefKeyword => null;
 }