Support generation of tearoffs for instance methods.

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 '../../js/js.dart' as js;
 import '../../js_backend/js_backend.dart' show
     JavaScriptBackend,
     Namer,
     ConstantEmitter;
 
 import 'package:_internal/compiler/js_lib/shared/embedded_names.dart' show
     DEFERRED_LIBRARY_URIS,
     DEFERRED_LIBRARY_HASHES,
     GET_TYPE_FROM_NAME,
     INITIALIZE_LOADED_HUNK,
     IS_HUNK_INITIALIZED,
     IS_HUNK_LOADED,
     MANGLED_GLOBAL_NAMES,
     METADATA,
     TYPE_TO_INTERCEPTOR_MAP;
 
-import '../js_emitter.dart' show NativeGenerator;
+import '../js_emitter.dart' show NativeGenerator, buildTearOffCode;
 import '../model.dart';
 
 class ModelEmitter {
   final Compiler compiler;
   final Namer namer;
   final ConstantEmitter constantEmitter;
 
   JavaScriptBackend get backend => compiler.backend;
 
   /// For deferred loading we communicate the initializers via this global var.
@@ skipping 65 matching lines @@
     } else {
       nativeBoilerplate = js.js.statement(";");
     }
 
     js.Expression code = new js.ArrayInitializer(elements);
 
     return js.js.statement(
         boilerplate,
         {'deferredInitializer': emitDeferredInitializerGlobal(program.loadMap),
          'holders': emitHolders(fragment.holders),
+         'tearOff': buildTearOffCode(backend),
+         'parseFunctionDescriptor':
+           js.js.statement(parseFunctionDescriptorBoilerplate),
          'cyclicThrow':
            backend.emitter.staticFunctionAccess(backend.getCyclicThrowHelper()),
          'outputContainsConstantList': program.outputContainsConstantList,
          'embeddedGlobals': emitEmbeddedGlobals(program),
          'constants': emitConstants(fragment.constants),
          'staticNonFinals':
            emitStaticNonFinalFields(fragment.staticNonFinalFields),
          'nativeBoilerplate': nativeBoilerplate,
          'operatorIsPrefix': js.string(namer.operatorIsPrefix),
          'eagerClasses': emitEagerClassInitializations(fragment.libraries),
@@ skipping 281 matching lines @@
         [methods, isChecks, gettersSetters].expand((x) => x);
     elements.addAll(allMethods.expand(emitInstanceMethod));
     return unparse(compiler, new js.ArrayInitializer(elements));
   }
 
   js.Expression emitLazyInitializer(StaticField field) {
     assert(field.isLazy);
     return unparse(compiler, field.code);
   }
 
-  static final String tearOffBoilerplate = """
-function(prototype, tearOffDescriptor) {
-  prototype[tearOffDescriptor[0]] = tearOffDescriptor[1];
-  for (var i = 3; i < tearOffDescriptor.length; i += 3) {
-    // Copy over the adapter stubs.
-    prototype[tearOffDescriptor[i]] = tearOffDescriptor[i + 2];
+  static final String parseFunctionDescriptorBoilerplate = r"""
+function parseFunctionDescriptor(proto, name, desc) {
+  if (desc instanceof Array) {
+    proto[name] = desc[0];
+    var funs = [desc[0]];
+    funs[0].$callName = desc[1];
+    for (var pos = 4; pos < desc.length; pos += 3) {
+      var stub = desc[pos+2];
+      stub.$callName = desc[pos+1];
+      proto[desc[pos]] = stub;
+      funs.push(stub);
+    }
+    if (desc[2] != null) {
+      proto[desc[2]] = tearOff(funs, desc[3], false, name, false);
+    }
+  } else {
+    proto[name] = desc;
   }
-  // Build the functions map.
-  var funcs = Object.create(null);
-  for (var i = 3; i < tearOffDescriptor.length; i += 3) {
-    // Copy over the adapter stubs.
-    prototype[tearOffDescriptor[i]] = tearOffDescriptor[i + 2];
-  }
-  
 }
 """;
 
   Iterable<js.Expression> emitInstanceMethod(Method method) {
 
     List<js.Expression> makeNameCodePair(Method method) {
       return [js.string(method.name), method.code];
     }
 
     List<js.Expression> makeNameCallNameCodeTriplet(AdapterStubMethod stub) {
       js.Expression callName = stub.callName == null
           ? new js.LiteralNull()
           : js.string(stub.callName);
       return [js.string(stub.name), callName, method.code];

[floitsch, 2015/01/30 22:08:39]

This should be `stub.code`.

     }
 
     if (method is DartMethod) {
       if (method.needsTearOff) {
-        var data = makeNameCodePair(method);
+        // [name, [function, callName, tearOffName, functionType,
+        //     stub1_name, stub1_callName, stub1_code, ...]
+        var data = [method.code];
+        data.add(js.string(method.callName));
         data.add(js.string(method.tearOffName));
+        data.add(new js.LiteralNull());
         data.addAll(method.adapterStubs.expand(makeNameCallNameCodeTriplet));
-        return [new js.ArrayInitializer(data)];
+        return [js.string(method.name), new js.ArrayInitializer(data)];
       } else {
         // TODO(floitsch): not the most efficient way...
         return ([method]..addAll(method.adapterStubs)).expand(makeNameCodePair);
       }
     } else {
       return makeNameCodePair(method);
     }
   }
 
   Iterable<js.Expression> emitStaticMethod(StaticMethod method) {
@@ skipping 14 matching lines @@
     }
     return output;
   }
 
   static final String boilerplate = """
 {
 // Declare deferred-initializer global.
 #deferredInitializer;
 
 !function(start, program) {
-
+  var functionCounter = 0;
   // Initialize holder objects.
   #holders;
 
   function setupProgram() {
     for (var i = 0; i < program.length - 1; i++) {
       setupLibrary(program[i]);
     }
     setupLazyStatics(program[i]);
   }
 
@@ skipping 68 matching lines @@
       constructor.apply(object, arguments);
       return object;
     };
 
     // We store the ensureResolved function on the patch function to make it
     // possible to resolve superclass references without constructing instances.
     patch.ensureResolved = ensureResolved;
     holder[name] = patch;
   }
 
+  #tearOff;
+
+  #parseFunctionDescriptor;
+
   function compileConstructor(name, descriptor) {
     descriptor = compile(name, descriptor);
     var prototype = determinePrototype(descriptor);
     var constructor;
     // $mixinFormatDescription.
     if (typeof descriptor[2] !== 'function') {
       constructor = compileMixinConstructor(name, prototype, descriptor);
       for (var i = 4; i < descriptor.length; i += 2) {
-        prototype[descriptor[i]] = descriptor[i + 1];
+        parseFunctionDescriptor(prototype, descriptor);
       }
     } else {
       constructor = descriptor[2];
       for (var i = 3; i < descriptor.length; i += 2) {
-        prototype[descriptor[i]] = descriptor[i + 1];
+        parseFunctionDescriptor(prototype, descriptor[i], descriptor[i+1]);

[floitsch, 2015/01/30 22:08:39]

Don't remove the spaces of "i + 1".

       }
     }
     constructor.builtin\$cls = name;  // Needed for RTI.
     constructor.prototype = prototype;
     prototype[#operatorIsPrefix + name] = constructor;
     prototype.constructor = constructor;
     return constructor;
   }
 
   function compileMixinConstructor(name, prototype, descriptor) {
@@ skipping 66 matching lines @@
 
   var end = Date.now();
   print('Setup: ' + (end - start) + ' ms.');
 
   #main();  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }