dart2js: add function type to the model.

pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart

 // Copyright (c) 2013, 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.
 
 part of dart2js.js_emitter;
 
 /// This class should morph into something that makes it easy to build
 /// JavaScript representations of libraries, class-sides, and instance-sides.
 /// Initially, it is just a placeholder for code that is moved from
 /// [CodeEmitterTask].
 class ContainerBuilder extends CodeEmitterHelper {
 
   void addMemberMethod(DartMethod method, ClassBuilder builder) {
     FunctionElement member = method.element;
     String name = method.name;
     FunctionSignature parameters = member.functionSignature;
     jsAst.Expression code = method.code;
     bool needsStubs = method.parameterStubs.isNotEmpty;
     bool canBeApplied = method.canBeApplied;
     bool canBeReflected = method.canBeReflected;
     bool canTearOff = method.needsTearOff;
     String tearOffName = method.tearOffName;
     bool isClosure = method is InstanceMethod && method.isClosure;
     String superAlias = method is InstanceMethod ? method.aliasName : null;
     bool hasSuperAlias = superAlias != null;
+    jsAst.Expression memberTypeExpression = method.functionType;
 
     bool needStructuredInfo =
         canTearOff || canBeReflected || canBeApplied || hasSuperAlias;
 
     emitter.interceptorEmitter.recordMangledNameOfMemberMethod(member, name);
 
     if (!needStructuredInfo) {
       compiler.dumpInfoTask.registerElementAst(member,
           builder.addProperty(name, code));
 
@@ skipping 83 matching lines @@
       } else {
         // TOOD(floitsch): Since we know when reading static data versus
         // instance data, we can eliminate this element.
         expressions.add(js('null'));
       }
       String callName = stub.callName;
       String callSelectorString = (callName == null) ? 'null' : '"$callName"';
       tearOffInfo.add(new jsAst.LiteralString(callSelectorString));
     }
 
-    jsAst.Expression memberTypeExpression;
-    if (canTearOff || canBeReflected) {
-      DartType memberType = method.type;
-      if (memberType.containsTypeVariables) {
-        jsAst.Expression thisAccess = js(r'this.$receiver');
-        memberTypeExpression =
-            backend.rti.getSignatureEncoding(memberType, thisAccess);
-      } else {
-        memberTypeExpression =
-            js.number(task.metadataCollector.reifyType(memberType));
-      }
-    } else {
-      memberTypeExpression = js('null');
-    }
-
     expressions
         ..addAll(tearOffInfo)
         ..add((tearOffName == null || member.isAccessor)
               ? js("null") : js.string(tearOffName))
         ..add(js.number(requiredParameterCount))
         ..add(js.number(optionalParameterCount))
-        ..add(memberTypeExpression)
+        ..add(memberTypeExpression == null ? js("null") : memberTypeExpression)
         ..addAll(task.metadataCollector
             .reifyDefaultArguments(member).map(js.number));
 
     if (canBeReflected || canBeApplied) {
       parameters.forEachParameter((Element parameter) {
         expressions.add(
             js.number(task.metadataCollector.reifyName(parameter.name)));
         if (backend.mustRetainMetadata) {
           Iterable<int> metadataIndices =
               parameter.metadata.map((MetadataAnnotation annotation) {
@@ skipping 30 matching lines @@
     jsAst.ArrayInitializer arrayInit =
       new jsAst.ArrayInitializer(expressions.toList());
     compiler.dumpInfoTask.registerElementAst(member,
         builder.addProperty(name, arrayInit));
   }
 
   void addMemberField(Field field, ClassBuilder builder) {
     // For now, do nothing.
   }
 }