Add DartTypes to abstract Types.

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 '../util/util.dart' show CURRENT_ELEMENT_SPANNABLE;
 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:
  *
@@ skipping 16 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 dart2js.InternalErrorFunction internalError;
+  final Element identicalFunction;
   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.glue, this.internalError, this.identicalFunction);
 
   Builder.inner(Builder parent)
       : this.parent = parent,
         this.glue = parent.glue,
-        compiler = parent.compiler;
+        this.internalError = parent.internalError,
+            this.identicalFunction = parent.identicalFunction;
 
   /// 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);
     }
     return local2closure.putIfAbsent(irVariable,
@@ skipping 14 matching lines @@
     return variables[primitive.registerIndex];
   }
 
   /// Obtains a reference to the tree Variable corresponding to the IR primitive
   /// referred to by [reference].
   /// This increments the reference count for the given variable, so the
   /// returned expression must be used in the tree.
   Expression getVariableReference(cps_ir.Reference reference) {
     Variable variable = getVariable(reference.definition);
     if (variable == null) {
-      compiler.internalError(
-          compiler.currentElement,
+      internalError(
+          CURRENT_ELEMENT_SPANNABLE,
           "Reference to ${reference.definition} has no register");
     }
     ++variable.readCount;
     return variable;
   }
 
   ExecutableDefinition build(cps_ir.ExecutableDefinition node) {
     if (node is cps_ir.FieldDefinition) {
       return buildField(node);
     } else if (node is cps_ir.FunctionDefinition) {
@@ skipping 358 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');
+    internalError(CURRENT_ELEMENT_SPANNABLE, 'Unexpected IR node: $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.');
+    internalError(CURRENT_ELEMENT_SPANNABLE, 'Unexpected IR node: $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,
+        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)]);
   }
 }