Revert "Extract CallStructure from Selector."

pkg/compiler/lib/src/js_emitter/parameter_stub_generator.dart

 // Copyright (c) 2015, 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;
 
 class ParameterStubGenerator {
   static final Set<Selector> emptySelectorSet = new Set<Selector>();
 
   final Namer namer;
@@ skipping 20 matching lines @@
    *
    * Members may be invoked in two ways: directly, or through a closure. In the
    * latter case the caller invokes the closure's `call` method. This method
    * accepts two selectors. The returned stub method has the corresponding
    * name [ParameterStubMethod.name] and [ParameterStubMethod.callName] set if
    * the input selector is non-null (and the member needs a stub).
    */
   ParameterStubMethod generateParameterStub(FunctionElement member,
                                             Selector selector,
                                             Selector callSelector) {
-    CallStructure callStructure = selector.callStructure;
     FunctionSignature parameters = member.functionSignature;
-    int positionalArgumentCount = callStructure.positionalArgumentCount;
+    int positionalArgumentCount = selector.positionalArgumentCount;
     if (positionalArgumentCount == parameters.parameterCount) {
-      assert(callStructure.isUnnamed);
+      assert(selector.namedArgumentCount == 0);
       return null;
     }
-    if (parameters.optionalParametersAreNamed &&
-        callStructure.namedArgumentCount == parameters.optionalParameterCount) {
+    if (parameters.optionalParametersAreNamed
+        && selector.namedArgumentCount == parameters.optionalParameterCount) {
       // If the selector has the same number of named arguments as the element,
       // we don't need to add a stub. The call site will hit the method
       // directly.
       return null;
     }
     JavaScriptConstantCompiler handler = backend.constants;
-    List<String> names = callStructure.getOrderedNamedArguments();
+    List<String> names = selector.getOrderedNamedArguments();
 
     bool isInterceptedMethod = backend.isInterceptedMethod(member);
 
     // If the method is intercepted, we need to also pass the actual receiver.
     int extraArgumentCount = isInterceptedMethod ? 1 : 0;
     // Use '$receiver' to avoid clashes with other parameter names. Using
     // '$receiver' works because namer.safeVariableName used for getting parameter
     // names never returns a name beginning with a single '$'.
     String receiverArgumentName = r'$receiver';
 
@@ skipping 113 matching lines @@
   // (3) foo$3$d(a, b, d) => foo$4$c$d(a, b, null, d);
   // (4) No stub generated, call is direct.
   // (5) No stub generated, call is direct.
   //
   // We need to pay attention if this stub is for a function that has been
   // invoked from a subclass. Then we cannot just redirect, since that
   // would invoke the methods of the subclass. We have to compile to:
   // (1) foo$2(a, b) => MyClass.foo$4$c$d.call(this, a, b, null, null)
   // (2) foo$3$c(a, b, c) => MyClass.foo$4$c$d(this, a, b, c, null);
   // (3) foo$3$d(a, b, d) => MyClass.foo$4$c$d(this, a, b, null, d);
-  List<ParameterStubMethod> generateParameterStubs(MethodElement member,
-                                                   {bool canTearOff: true}) {
+  List<ParameterStubMethod> generateParameterStubs(FunctionElement member,
+                                                 {bool canTearOff: true}) {
     if (member.enclosingElement.isClosure) {
       ClosureClassElement cls = member.enclosingElement;
       if (cls.supertype.element == backend.boundClosureClass) {
         compiler.internalError(cls.methodElement, 'Bound closure1.');
       }
       if (cls.methodElement.isInstanceMember) {
         compiler.internalError(cls.methodElement, 'Bound closure2.');
       }
     }
 
@@ skipping 35 matching lines @@
     // For example, for the call-selector `call(x, y)` the renamed selector
     // for member `foo` would be `foo(x, y)`.
     Set<Selector> renamedCallSelectors =
         callSelectors.isEmpty ? emptySelectorSet : new Set<Selector>();
 
     Set<Selector> untypedSelectors = new Set<Selector>();
 
     // Start with the callSelectors since they imply the generation of the
     // non-call version.
     for (Selector selector in callSelectors) {
-      Selector renamedSelector = new Selector(
-          SelectorKind.CALL,
-          member.memberName,
-          selector.callStructure);
+      Selector renamedSelector = new Selector.call(
+          member.name, member.library,
+          selector.argumentCount, selector.namedArguments);
       renamedCallSelectors.add(renamedSelector);
 
       if (!renamedSelector.appliesUnnamed(member, compiler.world)) continue;
 
       if (untypedSelectors.add(renamedSelector.asUntyped)) {
         ParameterStubMethod stub =
             generateParameterStub(member, renamedSelector, selector);
         if (stub != null) {
           stubs.add(stub);
         }
@@ skipping 12 matching lines @@
             generateParameterStub(member, selector, null);
         if (stub != null) {
           stubs.add(stub);
         }
       }
     }
 
     return stubs;
   }
 }