dart2js cps: Cleanup.

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 '../../tree_ir/tree_ir_nodes.dart' show BuiltinOperator;
@@ skipping 173 matching lines @@
 
   @override
   js.Expression visitConstant(tree_ir.Constant node) {
     return buildConstant(node.value);
   }
 
   js.Expression compileConstant(ParameterElement parameter) {
     return buildConstant(glue.getConstantValueForVariable(parameter));
   }
 
-  // TODO(karlklose): get rid of the selector argument.
-  js.Expression buildStaticInvoke(Selector selector,
-                                  Element target,
+  js.Expression buildStaticInvoke(Element target,
                                   List<js.Expression> arguments,
                                   {SourceInformation sourceInformation}) {
     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, js.string(selector.name),
-                             arguments);
-    } else {
-      js.Expression elementAccess = glue.staticFunctionAccess(target);
-      return new js.Call(elementAccess, arguments,
-          sourceInformation: sourceInformation);
-    }
+    js.Expression elementAccess = glue.staticFunctionAccess(target);
+    return new js.Call(elementAccess, arguments,
+        sourceInformation: sourceInformation);
   }
 
   @override
   js.Expression visitInvokeConstructor(tree_ir.InvokeConstructor node) {
     if (node.constant != null) return giveup(node);
 
     registry.registerInstantiatedType(node.type);
     Selector selector = node.selector;
     FunctionElement target = node.target;
     List<js.Expression> arguments = visitExpressionList(node.arguments);
-    return buildStaticInvoke(selector, target, arguments);
+    return buildStaticInvoke(target, arguments);
   }
 
   void registerMethodInvoke(tree_ir.InvokeMethod node) {
     Selector selector = node.selector;
     TypeMask mask = node.mask;
     if (selector.isGetter) {
       registry.registerDynamicGetter(new UniverseSelector(selector, mask));
     } else if (selector.isSetter) {
       registry.registerDynamicSetter(new UniverseSelector(selector, mask));
     } else {
@@ skipping 11 matching lines @@
   @override
   js.Expression visitInvokeMethod(tree_ir.InvokeMethod node) {
     registerMethodInvoke(node);
     return js.propertyCall(visitExpression(node.receiver),
                            glue.invocationName(node.selector),
                            visitExpressionList(node.arguments));
   }
 
   @override
   js.Expression visitInvokeStatic(tree_ir.InvokeStatic node) {
-    Selector selector = node.selector;
-    assert(selector.isGetter || selector.isSetter || selector.isCall);
     FunctionElement target = node.target;
     List<js.Expression> arguments = visitExpressionList(node.arguments);
-    return buildStaticInvoke(selector, target, arguments,
-        sourceInformation: node.sourceInformation);
+    return buildStaticInvoke(target, arguments,
+          sourceInformation: node.sourceInformation);
   }
 
   @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.
       return js.js('#.#(#)',
           [visitExpression(node.receiver),
@@ skipping 24 matching lines @@
     }
     List<js.Expression> entries =
         new List<js.Expression>(2 * node.entries.length);
     for (int i = 0; i < node.entries.length; i++) {
       entries[2 * i] = visitExpression(node.entries[i].key);
       entries[2 * i + 1] = visitExpression(node.entries[i].value);
     }
     List<js.Expression> args = entries.isEmpty
          ? <js.Expression>[]
          : <js.Expression>[new js.ArrayInitializer(entries)];
-    return buildStaticInvoke(
-        new Selector.call(constructor.name, constructor.library, 2),
-        constructor,
-        args);
+    return buildStaticInvoke(constructor, args);
   }
 
   @override
   js.Expression visitLogicalOperator(tree_ir.LogicalOperator node) {
     return new js.Binary(
         node.operator,
         visitExpression(node.left),
         visitExpression(node.right));
   }
 
@@ skipping 354 matching lines @@
     assert(node.element is FieldElement);
     registry.registerStaticUse(node.element.declaration);
     js.Expression field = glue.staticFieldAccess(node.element);
     js.Expression value = visitExpression(node.value);
     return new js.Assignment(field, value);
   }
 
   js.Expression buildStaticHelperInvocation(FunctionElement helper,
                                             List<js.Expression> arguments) {
     registry.registerStaticUse(helper);
-    return buildStaticInvoke(new Selector.fromElement(helper), helper,
-        arguments);
+    return buildStaticInvoke(helper, arguments);
   }
 
   @override
   js.Expression visitReifyRuntimeType(tree_ir.ReifyRuntimeType node) {
     FunctionElement createType = glue.getCreateRuntimeType();
     FunctionElement typeToString = glue.getRuntimeTypeToString();
     return buildStaticHelperInvocation(createType,
         [buildStaticHelperInvocation(typeToString,
             [visitExpression(node.value)])]);
   }
@@ skipping 85 matching lines @@
         return js.js("typeof # === 'number' && Math.floor(#) === #", args);
     }
   }
 
   visitFunctionExpression(tree_ir.FunctionExpression node) {
     // FunctionExpressions are currently unused.
     // We might need them if we want to emit raw JS nested functions.
     throw 'FunctionExpressions should not be used';
   }
 }