dart2js: add function type to the model.

pkg/compiler/lib/src/js_emitter/model.dart

 // Copyright (c) 2014, 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 dart2js.new_js_emitter.model;
 
 import '../js/js.dart' as js show Expression, Statement;
 import '../constants/values.dart' show ConstantValue;
 
 import '../deferred_load.dart' show OutputUnit;
@@ skipping 329 matching lines @@
   Method(this.element, this.name, this.code);
 }
 
 /// A method that corresponds to a method in the original Dart program.
 class DartMethod extends Method {
   final bool needsTearOff;
   final String tearOffName;
   final List<ParameterStubMethod> parameterStubs;
   final bool canBeApplied;
   final bool canBeReflected;
-  final DartType type;
+
+  // Is non-null if [needsTearOff] or [canBeReflected].
+  //
+  // If the type is encoded in the metadata table this field contains an index
+  // into the table. Otherwise the type contains type variables in which case
+  // this field holds a function computing the function signature.
+  final js.Expression functionType;
 
   // Signature information for this method. This is only required and stored
   // here if the method [canBeApplied] or [canBeReflected]
   final int requiredParameterCount;
   final /* Map | List */ optionalParameterDefaultValues;
 
   // If this method can be torn off, contains the name of the corresponding
   // call method. For example, for the member `foo$1$name` it would be
   // `call$1$name` (in unminified mode).
   final String callName;
 
   DartMethod(Element element, String name, js.Expression code,
-             this.parameterStubs, this.callName, this.type,
+             this.parameterStubs, this.callName,
              {this.needsTearOff, this.tearOffName, this.canBeApplied,
               this.canBeReflected, this.requiredParameterCount,
-              this.optionalParameterDefaultValues})
+              this.optionalParameterDefaultValues, this.functionType})
       : super(element, name, code) {
     assert(needsTearOff != null);
     assert(!needsTearOff || tearOffName != null);
     assert(canBeApplied != null);
     assert(canBeReflected != null);
     assert((!canBeReflected && !canBeApplied) ||
            (requiredParameterCount != null &&
             optionalParameterDefaultValues != null));
   }
 }
 
 class InstanceMethod extends DartMethod {
   /// An alternative name for this method. This is used to model calls to
   /// a method via `super`. If [aliasName] is non-null, the emitter has to
   /// ensure that this method is registered on the prototype under both [name]
   /// and [aliasName].
   final String aliasName;
   final bool isClosure;
 
 
   InstanceMethod(Element element, String name, js.Expression code,
                  List<ParameterStubMethod> parameterStubs,
-                 String callName, DartType type,
+                 String callName,
                  {bool needsTearOff,
                   String tearOffName,
                   this.aliasName,
                   bool canBeApplied,
                   bool canBeReflected,
                   int requiredParameterCount,
                   /* List | Map */ optionalParameterDefaultValues,
-                  this.isClosure})
-      : super(element, name, code, parameterStubs, callName, type,
+                  this.isClosure,
+                  js.Expression functionType})
+      : super(element, name, code, parameterStubs, callName,
               needsTearOff: needsTearOff,
               tearOffName: tearOffName,
               canBeApplied: canBeApplied,
               canBeReflected: canBeReflected,
               requiredParameterCount: requiredParameterCount,
-              optionalParameterDefaultValues: optionalParameterDefaultValues) {
+              optionalParameterDefaultValues: optionalParameterDefaultValues,
+              functionType: functionType) {
     assert(isClosure != null);
   }
 }
 
 /// A method that is generated by the backend and has not direct correspondence
 /// to a method in the original Dart program. Examples are getter and setter
 /// stubs and stubs to dispatch calls to methods with optional parameters.
 class StubMethod extends Method {
   StubMethod(String name, js.Expression code,
              {Element element})
@@ skipping 23 matching lines @@
 
 abstract class StaticMethod implements Method {
   Holder get holder;
 }
 
 class StaticDartMethod extends DartMethod implements StaticMethod {
   final Holder holder;
 
   StaticDartMethod(Element element, String name, this.holder,
                    js.Expression code, List<ParameterStubMethod> parameterStubs,
-                   String callName, DartType type,
+                   String callName,
                    {bool needsTearOff, String tearOffName, bool canBeApplied,
                     bool canBeReflected, int requiredParameterCount,
-                    /* List | Map */ optionalParameterDefaultValues})
-      : super(element, name, code, parameterStubs, callName, type,
+                    /* List | Map */ optionalParameterDefaultValues,
+                    js.Expression functionType})
+      : super(element, name, code, parameterStubs, callName,
               needsTearOff: needsTearOff,
               tearOffName : tearOffName,
               canBeApplied : canBeApplied,
               canBeReflected : canBeReflected,
               requiredParameterCount: requiredParameterCount,
-              optionalParameterDefaultValues: optionalParameterDefaultValues);
+              optionalParameterDefaultValues: optionalParameterDefaultValues,
+              functionType: functionType);
 }
 
 class StaticStubMethod extends StubMethod implements StaticMethod {
   Holder holder;
   StaticStubMethod(String name, this.holder, js.Expression code)
       : super(name, code);
 }