Change how we generate bound closures to handler boud closures due to super getters: we need to pas…

sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart

 // Copyright (c) 2012, 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 js_backend;
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
@@ skipping 2529 matching lines @@
       // its stubs we simply create a fake element with the correct name.
       // Note: the callElement will not have any enclosingElement.
       FunctionElement callElement =
           new ClosureInvocationElement(namer.closureInvocationSelectorName,
                                        member);
 
       String invocationName = namer.instanceMethodName(callElement);
 
       List<String> parameters = <String>[];
       List<jsAst.Expression> arguments = <jsAst.Expression>[];
+      arguments.add(js('this')[fieldNames[0]]);
       if (inInterceptor) {
         arguments.add(js('this')[fieldNames[2]]);
       }
       for (int i = 0; i < parameterCount; i++) {
         String name = 'p$i';
         parameters.add(name);
         arguments.add(js(name));
       }
 
       jsAst.Expression fun = js.fun(
           parameters,
           js.return_(
-              js('this')[fieldNames[0]][js('this')[fieldNames[1]]](arguments)));
+              js('this')[fieldNames[1]]['call'](arguments)));
       boundClosureBuilder.addProperty(invocationName, fun);
 
       addParameterStubs(callElement, boundClosureBuilder.addProperty);
 
       void emitFunctionTypeSignature(Element method, FunctionType methodType) {
         jsAst.Expression encoding = backend.rti.getSignatureEncoding(
             methodType, js('this')[fieldNames[0]]);
         String operatorSignature = namer.operatorSignature();
         boundClosureBuilder.addProperty(operatorSignature, encoding);
       }
@@ skipping 19 matching lines @@
       }
     }
 
     // And finally the getter.
     String getterName = namer.getterName(member);
     String targetName = namer.instanceMethodName(member);
 
     List<String> parameters = <String>[];
     List<jsAst.Expression> arguments = <jsAst.Expression>[];
     arguments.add(js('this'));
-    arguments.add(js.string(targetName));
+    String className = backend.namer.isolateAccess(classElement);

[ahe, 2013/09/16 12:26:40]

Use elementAccess, not isolateAccess.

[ngeoffray, 2013/09/16 12:34:35]

Done.

+    jsAst.VariableUse classReference = new jsAst.VariableUse(className);

[ahe, 2013/09/16 12:26:40]

And then don't wrap it in VariableUse.

[ngeoffray, 2013/09/16 12:34:35]

Done.

+    jsAst.PropertyAccess prototype =
+        new jsAst.PropertyAccess.field(classReference, "prototype");
+    jsAst.PropertyAccess method =
+        new jsAst.PropertyAccess.field(prototype, targetName);

[ahe, 2013/09/16 12:26:40]

The above lines can be written as:

jsAst.PropertyAccess method =
    backend.namer.elementAccess(classElement)['prototype'][targetName];

[ngeoffray, 2013/09/16 12:34:35]

Done.

+
+    arguments.add(method);
     if (inInterceptor) {
       String receiverArg = fieldNames[2];
       parameters.add(receiverArg);
       arguments.add(js(receiverArg));
     } else {
       // Put null in the intercepted receiver field.
       arguments.add(new jsAst.LiteralNull());
     }
+    arguments.add(js.string(targetName));
 
     jsAst.Expression getterFunction = js.fun(
         parameters, js.return_(js(closureClass).newWith(arguments)));
 
     defineStub(getterName, getterFunction);
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
@@ skipping 1574 matching lines @@
 
 const String HOOKS_API_USAGE = """
 // The code supports the following hooks:
 // dartPrint(message)   - if this function is defined it is called
 //                        instead of the Dart [print] method.
 // dartMainRunner(main) - if this function is defined, the Dart [main]
 //                        method will not be invoked directly.
 //                        Instead, a closure that will invoke [main] is
 //                        passed to [dartMainRunner].
 """;