dart2js: add function type to the model.

pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.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_emitter;
 
 import '../../constants/values.dart' show ConstantValue;
 import '../../dart2jslib.dart' show Compiler;
 import '../../dart_types.dart' show DartType;
 import '../../elements/elements.dart' show ClassElement;
@@ skipping 611 matching lines @@
     if (descriptor[pos] != null) {
       f[#argCnt] = descriptor[pos];
       f[#defArgValues] = descriptor[pos + 1];
     }
   } else {
     proto[name] = descriptor;
   }
 }
 """;
 
-  js.Expression _generateFunctionType(DartType memberType) {
-    if (memberType.containsTypeVariables) {
-      js.Expression thisAccess = js.js(r'this.$receiver');
-      return backend.rti.getSignatureEncoding(memberType, thisAccess);
-    } else {
-      return js.number(backend.emitter.metadataCollector.reifyType(memberType));
-    }
-  }
-
   js.Expression _encodeOptionalParameterDefaultValues(DartMethod method) {
     js.Expression result;
     // TODO(herhut): Replace [js.LiteralNull] with [js.ArrayHole].
     if (method.optionalParameterDefaultValues is List) {
       List<ConstantValue> defs = method.optionalParameterDefaultValues;
       Iterable<js.Expression> elements = defs.map(constantEmitter.reference);
       return new js.ArrayInitializer(elements.toList());
     } else {
       Map<String, ConstantValue> defs = method.optionalParameterDefaultValues;
       List<js.Property> properties = <js.Property>[];
@@ skipping 28 matching lines @@
         if (method.aliasName != null) {
           data.add(js.string(method.aliasName));
         }
         data.add(method.code);
         data.add(js.string(method.callName));
 
         if (method.needsTearOff) {
           bool isIntercepted = backend.isInterceptedMethod(method.element);
           data.add(new js.LiteralBool(isIntercepted));
           data.add(js.string(method.tearOffName));
-          data.add(_generateFunctionType(method.type));
+          data.add((method.functionType));
         }
 
         data.addAll(method.parameterStubs.expand(makeNameCallNameCodeTriplet));
         if (method.canBeApplied) {
           data.add(js.number(method.requiredParameterCount));
           data.add(_encodeOptionalParameterDefaultValues(method));
         }
         return [js.string(method.name), new js.ArrayInitializer(data)];
       } else {
         // TODO(floitsch): not the most efficient way...
@@ skipping 28 matching lines @@
     if (method is StaticDartMethod) {
       if (method.needsTearOff) {
         /// The format emitted is the same as for the parser specified at
         /// [parseFunctionDescriptorBoilerplate] except for the missing
         /// field whether the method is intercepted.
         // [name, [function, callName, tearOffName, functionType,
         //     stub1_name, stub1_callName, stub1_code, ...]
         var data = [unparse(compiler, method.code)];
         data.add(js.string(method.callName));
         data.add(js.string(method.tearOffName));
-        data.add(_generateFunctionType(method.type));
+        data.add(method.functionType);
         data.addAll(method.parameterStubs.expand(makeNameCallNameCodeTriplet));
         if (method.canBeApplied) {
           data.add(js.number(method.requiredParameterCount));
           data.add(_encodeOptionalParameterDefaultValues(method));
         }
         return [js.string(method.name), holderIndex,
                 new js.ArrayInitializer(data)];
       } else {
         method.parameterStubs.forEach(_addMethod);
       }
@@ skipping 275 matching lines @@
 
   var end = Date.now();
   // print('Setup: ' + (end - start) + ' ms.');
 
   #invokeMain;  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }