dart2js: don't emit tear-off data if not needed.

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 '../../dart2jslib.dart' show Compiler;
 import '../../dart_types.dart' show DartType;
 import '../../elements/elements.dart' show ClassElement;
 import '../../js/js.dart' as js;
@@ skipping 489 matching lines @@
     assert(field.isLazy);
     return unparse(compiler, field.code);
   }
 
   /// JavaScript code template that implements parsing of a function descriptor.
   /// Descriptors are used in place of the actual JavaScript function
   /// definition in the output if additional information needs to be passed to
   /// facilitate the generation of tearOffs at runtime. The format is an array
   /// with the following fields:
   ///
+  /// [InstanceMethod.aliasName] (optional).
   /// [Method.code]
   /// [DartMethod.callName]
+  /// [JavaScriptBackend.isInterceptedMethod]

[floitsch, 2015/02/09 16:04:24]

No need to drag "JavaScriptBackend" into this.
just "isInterceptedMethod".

[floitsch, 2015/02/09 16:04:24]

That one is optional too, no?

[zarah, 2015/02/10 09:07:17]

yes, added a comment to the following two as well.

[zarah, 2015/02/10 09:07:17]

Done.

   /// [DartMethod.tearOffName]
-  /// [JavaScriptBackend.isInterceptedMethod]
   /// functionType
-  /// [InstanceMethod.aliasName]
   ///
   /// followed by
   ///
   /// [ParameterStubMethod.name]
   /// [ParameterStubMethod.code]
   ///
   /// for each stub in [DartMethod.parameterStubs].
 
   static final String parseFunctionDescriptorBoilerplate = r"""
 function parseFunctionDescriptor(proto, name, descriptor) {
   if (descriptor instanceof Array) {
-    proto[name] = descriptor[0];
-    var funs = [descriptor[0]];
-    funs[0].$callName = descriptor[1];
-    for (var pos = 6; pos < descriptor.length; pos += 3) {
+    var f, pos = -1;

[floitsch, 2015/02/09 16:04:24]

// `pos` points to the last read entry.

[zarah, 2015/02/10 09:07:17]

Done.

+    var aliasOrFunction = descriptor[++pos];
+    if (typeof aliasOrFunction == "string") {
+      // Install the alias for super calls on the prototype chain.
+      proto[aliasOrFunction] = f = descriptor[++pos];
+    } else {
+      f = aliasOrFunction;
+    }
+
+    proto[name] = f;
+    var funs = [f];
+    funs[0].$callName = descriptor[++pos];

[floitsch, 2015/02/09 16:04:24]

might as well use "f" directly here.

[zarah, 2015/02/10 09:07:17]

Done.

+
+
+    var isInterceptedOrParameterStubName = descriptor[pos + 1];
+    var isIntercepted, tearOffName, reflectionInfo;
+    if (typeof isInterceptedOrParameterStubName == "boolean") {
+      isIntercepted = descriptor[++pos];
+      tearOffName = descriptor[++pos];
+      reflectionInfo = descriptor[++pos];
+    }
+
+    for (++pos; pos < descriptor.length; pos += 3) {
       var stub = descriptor[pos + 2];
       stub.$callName = descriptor[pos + 1];
       proto[descriptor[pos]] = stub;
       funs.push(stub);
     }
-    if (descriptor[2] != null) {
-      var isIntercepted = descriptor[3];
-      var reflectionInfo = descriptor[4];
-      proto[descriptor[2]] = 
+
+    if (tearOffName) {
+      proto[tearOffName] =
           tearOff(funs, reflectionInfo, false, name, isIntercepted);
     }
-    // Install the alias for super calls on the prototype chain.
-    if (descriptor[5] != null) {
-      proto[descriptor[5]] = descriptor[0];
-    }
+
   } 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);
@@ skipping 12 matching lines @@
       js.Expression callName = stub.callName == null
           ? new js.LiteralNull()
           : js.string(stub.callName);
       return [js.string(stub.name), callName, stub.code];
     }
 
     if (method is InstanceMethod) {
       if (method.needsTearOff || method.aliasName != null) {
         /// See [parseFunctionDescriptorBoilerplate] for a full description of
         /// the format.
-        // [name, [function, callName, tearOffName, isIntercepted, functionType,
-        //     aliasName, stub1_name, stub1_callName, stub1_code, ...]
-        bool isIntercepted = backend.isInterceptedMethod(method.element);
-        var data = [method.code];
-        data.add(js.string(method.callName));
-        data.add(js.string(method.tearOffName));
-        data.add(new js.LiteralBool(isIntercepted));
-        data.add(_generateFunctionType(method.type));
+        // [name, [aliasName, function, callName, isIntercepted, tearOffName,
+        // functionType, stub1_name, stub1_callName, stub1_code, ...]
+        var data = [];
         if (method.aliasName != null) {
           data.add(js.string(method.aliasName));
-        } else {
-          data.add(new js.LiteralNull());
         }
+        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.addAll(method.parameterStubs.expand(makeNameCallNameCodeTriplet));
         return [js.string(method.name), new js.ArrayInitializer(data)];
       } else {
         // TODO(floitsch): not the most efficient way...
         return ([method]..addAll(method.parameterStubs))
             .expand(makeNameCodePair);
       }
     } else {
       return makeNameCodePair(method);
     }
@@ skipping 312 matching lines @@
 
   var end = Date.now();
   print('Setup: ' + (end - start) + ' ms.');
 
   #main();  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }