Revert "cps-ir: Add support for intercepted calls."

pkg/compiler/lib/src/tree_ir/tree_ir_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 tree_ir_builder;
 
 import '../dart2jslib.dart' as dart2js;
 import '../dart_types.dart';
 import '../elements/elements.dart';
 import '../cps_ir/cps_ir_nodes.dart' as cps_ir;
 import 'tree_ir_nodes.dart';
-import '../js_backend/codegen/glue.dart';
 
 /**
  * Builder translates from CPS-based IR to direct-style Tree.
  *
  * A call `Invoke(fun, cont, args)`, where cont is a singly-referenced
  * non-exit continuation `Cont(v, body)` is translated into a direct-style call
  * whose value is bound in the continuation body:
  *
  * `LetVal(v, Invoke(fun, args), body)`
  *
@@ skipping 14 matching lines @@
  *
  * Block arguments are later replaced with data flow during the Tree-to-Tree
  * translation out of SSA.  Jumps are eliminated during the Tree-to-Tree
  * control-flow recognition.
  *
  * Otherwise, the output of Builder looks very much like the input.  In
  * particular, intermediate values and blocks used for local control flow are
  * still all named.
  */
 class Builder extends cps_ir.Visitor<Node> {
-  // TODO(karlklose): remove the compiler.
   final dart2js.Compiler compiler;
-  final Glue glue;
 
   /// Maps variable/parameter elements to the Tree variables that represent it.
   final Map<Element, List<Variable>> element2variables =
       <Element,List<Variable>>{};
 
   /// Like [element2variables], except for closure variables.
   final Map<cps_ir.ClosureVariable, Variable> local2closure =
       <cps_ir.ClosureVariable, Variable>{};
 
   // Continuations with more than one use are replaced with Tree labels.  This
   // is the mapping from continuations to labels.
   final Map<cps_ir.Continuation, Label> labels = <cps_ir.Continuation, Label>{};
 
   ExecutableElement currentElement;
   cps_ir.Continuation returnContinuation;
 
   Builder parent;
 
-  Builder(this.glue, this.compiler);
+  Builder(this.compiler);
 
   Builder.inner(Builder parent)
       : this.parent = parent,
-        this.glue = parent.glue,
         compiler = parent.compiler;
 
   /// Variable used in [buildPhiAssignments] as a temporary when swapping
   /// variables.
   Variable phiTempVar;
 
   Variable getClosureVariable(cps_ir.ClosureVariable irVariable) {
     if (irVariable.host != currentElement) {
       return parent.getClosureVariable(irVariable);
     }
@@ skipping 76 matching lines @@
       phiTempVar = new Variable(node.element, null);
       body = visit(node.body);
     }
 
     return new FunctionDefinition(node.element, parameters,
         body, node.localConstants, node.defaultParameterValues);
   }
 
   List<Expression> translateArguments(List<cps_ir.Reference> args) {
     return new List<Expression>.generate(args.length,
-         (int index) => getVariableReference(args[index]),
-         growable: false);
+         (int index) => getVariableReference(args[index]));
   }
 
   List<Variable> translatePhiArguments(List<cps_ir.Reference> args) {
     return new List<Variable>.generate(args.length,
          (int index) => getVariableReference(args[index]));
   }
 
   Statement buildContinuationAssignment(
       cps_ir.Parameter parameter,
       Expression argument,
@@ skipping 133 matching lines @@
   }
 
   Statement visitInvokeStatic(cps_ir.InvokeStatic node) {
     // Calls are translated to direct style.
     List<Expression> arguments = translateArguments(node.arguments);
     Expression invoke = new InvokeStatic(node.target, node.selector, arguments);
     return continueWithExpression(node.continuation, invoke);
   }
 
   Statement visitInvokeMethod(cps_ir.InvokeMethod node) {
-    Expression invoke = new InvokeMethod(getVariableReference(node.receiver),
-                                         node.selector,
-                                         translateArguments(node.arguments));
+    Expression receiver = getVariableReference(node.receiver);
+    List<Expression> arguments = translateArguments(node.arguments);
+    Expression invoke = new InvokeMethod(receiver, node.selector, arguments);
     return continueWithExpression(node.continuation, invoke);
   }
 
   Statement visitInvokeSuperMethod(cps_ir.InvokeSuperMethod node) {
     List<Expression> arguments = translateArguments(node.arguments);
     Expression invoke = new InvokeSuperMethod(node.selector, arguments);
     return continueWithExpression(node.continuation, invoke);
   }
 
   Statement visitConcatenateStrings(cps_ir.ConcatenateStrings node) {
@@ skipping 141 matching lines @@
       // The successor will be filled in by visitLetPrim.
       return new FunctionDeclaration(getVariable(node), def, null);
     } else {
       return new FunctionExpression(def);
     }
   }
 
   Expression visitParameter(cps_ir.Parameter node) {
     // Continuation parameters are not visited (continuations themselves are
     // not visited yet).
-    compiler.internalError(compiler.currentElement,
-        'Unexpected IR node: $node');
+    compiler.internalError(compiler.currentElement, 'Unexpected IR node.');
     return null;
   }
 
   Expression visitContinuation(cps_ir.Continuation node) {
     // Until continuations with multiple uses are supported, they are not
     // visited.
-    compiler.internalError(compiler.currentElement,
-        'Unexpected IR node: $node.');
+    compiler.internalError(compiler.currentElement, 'Unexpected IR node.');
     return null;
   }
 
   Expression visitIsTrue(cps_ir.IsTrue node) {
     return getVariableReference(node.value);
   }
 
   dart2js.Selector get identicalSelector {
     return new dart2js.Selector.call('identical', null, 2);
   }
 
   Expression visitIdentical(cps_ir.Identical node) {
     return new InvokeStatic(
         compiler.identicalFunction,
         identicalSelector,
         <Expression>[getVariableReference(node.left),
                      getVariableReference(node.right)]);
   }
-
-  Expression visitInterceptor(cps_ir.Interceptor node) {
-    Element getInterceptor = glue.getInterceptorMethod;
-    glue.registerUseInterceptorInCodegen();
-    return new InvokeStatic(
-        getInterceptor,
-        new dart2js.Selector.fromElement(getInterceptor),
-        <Expression>[getVariableReference(node.input)]);
-  }
 }