dart2js: Refactor how parameter stubs are handled.

pkg/compiler/lib/src/js_emitter/program_builder.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.js_emitter.program_builder;
 
 import 'js_emitter.dart' show computeMixinClass;
 import 'model.dart';
 
 import '../common.dart';
@@ skipping 433 matching lines @@
         tearOffName = namer.getterName(element);
       }
     }
 
     if (canTearOff) {
       assert(invariant(element, !element.isGenerativeConstructor));
       assert(invariant(element, !element.isGenerativeConstructorBody));
       assert(invariant(element, !element.isConstructor));
     }
 
+    String callName = null;
+    if (canTearOff) {
+      Selector callSelector =
+          new Selector.fromElement(element).toCallSelector();
+      callName = namer.invocationName(callSelector);
+    }
+
     return new InstanceMethod(element, name, code,
-        _generateParameterStubs(element, canTearOff),
+        _generateParameterStubs(element, canTearOff), callName,
         needsTearOff: canTearOff, tearOffName: tearOffName,
         isClosure: isClosure, hasSuperAlias: hasSuperAlias,
         canBeApplied: canBeApplied, canBeReflected: canBeReflected);
   }
 
   List<ParameterStubMethod> _generateParameterStubs(FunctionElement element,
-                                           bool canTearOff) {
+                                                    bool canTearOff) {
 
     if (!_methodNeedsStubs(element)) return const <ParameterStubMethod>[];
 
-    List<ParameterStubMethod> parameterStubs = <ParameterStubMethod>[];
     ParameterStubGenerator generator =
         new ParameterStubGenerator(_compiler, namer, backend);
-    Map<Selector, js.Expression> parameterStubsForElement =
-        generator.generateParameterStubs(element, canTearOff);
-    parameterStubsForElement.forEach((Selector selector, js.Expression code) {
-      String name = namer.invocationName(selector);
-      parameterStubs.add(
-          _buildParameterStubMethod(name, code, selector, element: element));
-    });
-
-    return parameterStubs;
+    return generator.generateParameterStubs(element, canTearOff: canTearOff);
   }
 
   /// Builds a stub method.
   ///
   /// Stub methods may have an element that can be used for code-size
   /// attribution.
   Method _buildStubMethod(String name, js.Expression code,
                           {Element element}) {
     return new StubMethod(name, code, element: element);
   }
 
-  Method _buildParameterStubMethod(String name, js.Expression code,
-                                   Selector selector,
-                                   {Element element}) {
-    return new ParameterStubMethod(name, code, selector, element: element);
-  }
-
   // The getInterceptor methods directly access the prototype of classes.
   // We must evaluate these classes eagerly so that the prototype is
   // accessible.
   void _markEagerInterceptorClasses() {
     Map<String, Set<ClassElement>> specializedGetInterceptors =
         backend.specializedGetInterceptors;
     for (Set<ClassElement> classes in specializedGetInterceptors.values) {
       for (ClassElement element in classes) {
         Class cls = _classes[element];
         if (cls != null) cls.isEager = true;
@@ skipping 76 matching lines @@
       js.Expression code = stubGenerator.generateOneShotInterceptor(name);
       return new StaticStubMethod(name, holder, code);
     });
   }
 
   StaticDartMethod _buildStaticMethod(FunctionElement element) {
     String name = namer.getNameOfMember(element);
     String holder = namer.globalObjectFor(element);
     js.Expression code = backend.generatedCode[element];
 
-    final bool isNotApplyTarget = !element.isConstructor && !element.isAccessor;
+    final bool isApplyTarget = !element.isConstructor && !element.isAccessor;
     final bool canBeApplied = _methodCanBeApplied(element);
     final bool canBeReflected = _methodCanBeReflected(element);
 
-    final bool needsTearOff = isNotApplyTarget && (canBeReflected ||
-         universe.staticFunctionsNeedingGetter.contains(element));
+    final bool needsTearOff = isApplyTarget &&
+        (canBeReflected ||
+            universe.staticFunctionsNeedingGetter.contains(element));
 
     final String tearOffName =
         needsTearOff ? namer.getStaticClosureName(element) : null;
 
+    String callName = null;
+    if (needsTearOff) {
+      Selector callSelector =
+          new Selector.fromElement(element).toCallSelector();
+      callName = namer.invocationName(callSelector);
+    }
+
     return new StaticDartMethod(element,
                                 name, _registry.registerHolder(holder), code,
                                 _generateParameterStubs(element, needsTearOff),
+                                callName,
                                 needsTearOff: needsTearOff,
                                 tearOffName: tearOffName,
                                 canBeApplied: canBeApplied,
                                 canBeReflected: canBeReflected);
   }
 
   void _registerConstants(OutputUnit outputUnit,
                           Iterable<ConstantValue> constantValues) {
     // `constantValues` is null if an outputUnit doesn't contain any constants.
     if (constantValues == null) return;
     for (ConstantValue constantValue in constantValues) {
       _registry.registerConstant(outputUnit, constantValue);
       assert(!_constants.containsKey(constantValue));
       String name = namer.constantName(constantValue);
       String constantObject = namer.globalObjectForConstant(constantValue);
       Holder holder = _registry.registerHolder(constantObject);
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 }