dart2js: Refactor how parameter stubs are handled.

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].
@@ skipping 14 matching lines @@
 
     final bool needStructuredInfo =
         canTearOff || canBeReflected || canBeApplied || hasSuperAlias;
 
     emitter.interceptorEmitter.recordMangledNameOfMemberMethod(member, name);
 
     if (!needStructuredInfo) {
       compiler.dumpInfoTask.registerElementAst(member,
           builder.addProperty(name, code));
 
-      for (ParameterStubMethod method in method.parameterStubs) {
-        jsAst.Property property = builder.addProperty(method.name, method.code);
-        compiler.dumpInfoTask.registerElementAst(member, property);
+      for (ParameterStubMethod stub in method.parameterStubs) {
+        assert(stub.callName == null);
+        String invocationName = stub.name;
         emitter.interceptorEmitter
-            .recordMangledNameOfMemberMethod(member, method.name);
+            .recordMangledNameOfMemberMethod(member, invocationName);
+        compiler.dumpInfoTask.registerElementAst(
+            member, builder.addProperty(invocationName, stub.code));
       }
       return;
     }
     emitter.needsStructuredMemberInfo = true;
 
     // This element is needed for reflection or needs additional stubs or has a
     // super alias. So we need to retain additional information.
 
     // The information is stored in an array with this format:
     //
@@ skipping 35 matching lines @@
 
     if (onlyNeedsSuperAlias) {
       jsAst.ArrayInitializer arrayInit =
             new jsAst.ArrayInitializer(expressions);
           compiler.dumpInfoTask.registerElementAst(member,
               builder.addProperty(name, arrayInit));
       return;
     }
 
     String callSelectorString = 'null';
-    if (member.isFunction) {
-      Selector callSelector = new Selector.fromElement(member).toCallSelector();
-      callSelectorString = '"${namer.invocationName(callSelector)}"';
+    if (method.callName != null) {
+      callSelectorString = '"${method.callName}"';
     }
 
     // On [requiredParameterCount], the lower bit is set if this method can be
     // called reflectively.
     int requiredParameterCount = parameters.requiredParameterCount << 1;
     if (member.isAccessor) requiredParameterCount++;
 
     int optionalParameterCount = parameters.optionalParameterCount << 1;
     if (parameters.optionalParametersAreNamed) optionalParameterCount++;
 
     // TODO(sra): Don't use LiteralString for non-strings.
     List tearOffInfo = [new jsAst.LiteralString(callSelectorString)];
 
-    if (needsStubs || canTearOff) {
+    for (ParameterStubMethod stub in method.parameterStubs) {
+      String invocationName = stub.name;
+      emitter.interceptorEmitter
+          .recordMangledNameOfMemberMethod(member, invocationName);
 
-      for (ParameterStubMethod method in method.parameterStubs) {
-        String invocationName = method.name;
-        emitter.interceptorEmitter
-            .recordMangledNameOfMemberMethod(member, invocationName);
-        expressions.add(method.code);
-        if (member.isInstanceMember) {
-          expressions.add(js.string(invocationName));
-        } else {
-          expressions.add(js('null'));
-          // TOOD(ahe): Since we know when reading static data versus instance
-          // data, we can eliminate this element.
-        }
-
-        Set<Selector> callSelectors = compiler.codegenWorld.invokedNames[
-            namer.closureInvocationSelectorName];
-        Selector callSelector = method.selector.toCallSelector();
-        String callSelectorString = 'null';
-        if (canTearOff && callSelectors != null &&
-            callSelectors.contains(callSelector)) {
-          callSelectorString = '"${namer.invocationName(callSelector)}"';
-        }
-        tearOffInfo.add(new jsAst.LiteralString(callSelectorString));
+      expressions.add(stub.code);
+      if (member.isInstanceMember) {
+        expressions.add(js.string(invocationName));
+      } 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;
       if (member.isGenerativeConstructorBody) {
         var body = member;
         memberType = body.constructor.type;
       } else {
         memberType = member.type;
@@ skipping 60 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.
   }
 }