Move matching of arguments/selector against signature out of buildStaticInvoke.

pkg/compiler/lib/src/js_backend/codegen/codegen.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 code_generator;
 
 import 'glue.dart';
 
 import '../../tree_ir/tree_ir_nodes.dart' as tree_ir;
 import '../../js/js.dart' as js;
@@ skipping 148 matching lines @@
   @override
   js.Expression visitFunctionExpression(tree_ir.FunctionExpression node) {
     return giveup(node);
     // TODO: implement visitFunctionExpression
   }
 
   js.Expression compileConstant(ParameterElement parameter) {
     return buildConstant(glue.getConstantForVariable(parameter).value);
   }
 
+  // TODO(karlklose): get rid of the selector argument.
   js.Expression buildStaticInvoke(Selector selector,
                                   Element target,
                                   List<js.Expression> arguments) {
     registry.registerStaticInvocation(target.declaration);
     if (target == glue.getInterceptorMethod) {
       // This generates a call to the specialized interceptor function, which
       // does not have a specialized element yet, but is emitted as a stub from
       // the emitter in [InterceptorStubGenerator].
       // TODO(karlklose): Either change [InvokeStatic] to take an [Entity]
       //   instead of an [Element] and model the getInterceptor functions as
       //   [Entity]s or add a specialized Tree-IR node for interceptor calls.
       registry.registerUseInterceptor();
       js.VariableUse interceptorLibrary = glue.getInterceptorLibrary();
       return js.propertyCall(interceptorLibrary, selector.name, arguments);
     } else {
       js.Expression elementAccess = glue.staticFunctionAccess(target);
-      List<js.Expression> compiledArguments =
-          selector.makeArgumentsList(target.implementation,
-                                     arguments,
-                                     compileConstant);
-      return new js.Call(elementAccess, compiledArguments);
+      return new js.Call(elementAccess, arguments);
     }
   }
 
+  List<js.Expression> compileStaticArgumentList(
+      Selector selector,
+      Element target, /* TODO(karlklose): this should be the signature. */
+      List<tree_ir.Expression> arguments) {
+    return selector.makeArgumentsList(
+        target.implementation,
+        visitArguments(arguments),
+        compileConstant);
+  }
+
   @override
   js.Expression visitInvokeConstructor(tree_ir.InvokeConstructor node) {
     if (node.constant != null) return giveup(node);
     registry.registerInstantiatedClass(node.target.enclosingClass);
-    return buildStaticInvoke(node.selector,
-                             node.target,
-                             visitArguments(node.arguments));
+    Selector selector = node.selector;
+    FunctionElement target = node.target;
+    List<js.Expression> arguments =
+        compileStaticArgumentList(selector, target, node.arguments);
+    return buildStaticInvoke(selector, target, arguments);
   }
 
   void registerMethodInvoke(tree_ir.InvokeMethod node) {
     Selector selector = node.selector;
     if (selector.isGetter) {
       registry.registerDynamicGetter(selector);
     } else if (selector.isSetter) {
       registry.registerDynamicSetter(selector);
     } else {
       assert(invariant(CURRENT_ELEMENT_SPANNABLE,
@@ skipping 12 matching lines @@
     return js.propertyCall(visitExpression(node.receiver),
                            glue.invocationName(node.selector),
                            visitArguments(node.arguments));
   }
 
   @override
   js.Expression visitInvokeStatic(tree_ir.InvokeStatic node) {
     if (node.target is! FunctionElement) {
       giveup(node, 'static getters and setters are not supported.');
     }
-    return buildStaticInvoke(node.selector,
-                             node.target,
-                             visitArguments(node.arguments));
+    Selector selector = node.selector;
+    FunctionElement target = node.target;
+    List<js.Expression> arguments =
+        compileStaticArgumentList(selector, target, node.arguments);
+    return buildStaticInvoke(selector, target, arguments);
   }
 
   @override
   js.Expression visitInvokeMethodDirectly(tree_ir.InvokeMethodDirectly node) {
     registry.registerDirectInvocation(node.target.declaration);
     if (node.target is ConstructorBodyElement) {
       // A constructor body cannot be overriden or intercepted, so we can
       // use the short form for this invocation.
       // TODO(asgerf): prevent name clash between constructor bodies.
       return js.js('#.#(#)',
@@ skipping 237 matching lines @@
   void visitSetField(tree_ir.SetField node) {
     js.PropertyAccess field =
         new js.PropertyAccess.field(
             visitExpression(node.object),
             glue.instanceFieldPropertyName(node.field));
     js.Assignment asn = new js.Assignment(field, visitExpression(node.value));
     accumulator.add(new js.ExpressionStatement(asn));
     visitStatement(node.next);
   }
 }