Create a Tree IR builder for JavaScript specific nodes.

pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart

Index: pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
diff --git a/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart b/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
index a0fb7601ff86fdcbbf624f26a1111e1227e1b3d6..bb49ecc1fcc2582a85f1d9a23b09bf5cef2c977f 100644
--- a/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
+++ b/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
@@ -10,7 +10,6 @@ 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.
@@ -47,7 +46,6 @@ import '../js_backend/codegen/glue.dart';
 class Builder extends cps_ir.Visitor<Node> {
   final dart2js.InternalErrorFunction internalError;
   final Element identicalFunction;

[Johnni Winther, 2014/12/17 13:43:52]

Remove [identicalFunction]. It is only need in JsTreeBuilder.

[karlklose, 2014/12/17 14:11:35]

Done.

-  final Glue glue;
 
   /// Maps variable/parameter elements to the Tree variables that represent it.
   final Map<Element, List<Variable>> element2variables =
@@ -66,13 +64,11 @@ class Builder extends cps_ir.Visitor<Node> {
 
   Builder parent;
 
-  Builder(this.glue, this.internalError, this.identicalFunction);
+  Builder(this.internalError, this.identicalFunction, [this.parent]);
 
-  Builder.inner(Builder parent)
-      : this.parent = parent,
-        this.glue = parent.glue,
-        this.internalError = parent.internalError,
-            this.identicalFunction = parent.identicalFunction;
+  Builder createInnerBuilder() {
+    return new Builder(internalError, identicalFunction, this);
+  }
 
   /// Variable used in [buildPhiAssignments] as a temporary when swapping
   /// variables.
@@ -118,10 +114,14 @@ class Builder extends cps_ir.Visitor<Node> {
   ExecutableDefinition build(cps_ir.ExecutableDefinition node) {
     if (node is cps_ir.FieldDefinition) {
       return buildField(node);
-    } else if (node is cps_ir.FunctionDefinition) {
+    } else {
+      assert(dart2js.invariant(
+          currentElement,
+          node is cps_ir.FunctionDefinition,
+          message: 'expected FunctionDefinition or FieldDefinition, '
+            ' found $node'));
       return buildFunction(node);
     }
-    assert(false);
   }
 
   FieldDefinition buildField(cps_ir.FieldDefinition node) {
@@ -276,7 +276,13 @@ class Builder extends cps_ir.Visitor<Node> {
     return first;
   }
 
-  visitNode(cps_ir.Node node) => throw "Unhandled node: $node";
+  visitNode(cps_ir.Node node) {
+    if (node is cps_ir.JsSpecificNode) {
+      throw "Cannot handle JS specific IR nodes in this visitor";
+    } else {
+      throw "Unhandled node: $node";
+    }
+  }
 
   Statement visitLetPrim(cps_ir.LetPrim node) {
     Variable variable = getVariable(node.primitive);
@@ -468,7 +474,7 @@ class Builder extends cps_ir.Visitor<Node> {
   }
 
   FunctionDefinition makeSubFunction(cps_ir.FunctionDefinition function) {
-    return new Builder.inner(this).buildFunction(function);
+    return createInnerBuilder().buildFunction(function);
   }
 
   Node visitCreateFunction(cps_ir.CreateFunction node) {
@@ -501,26 +507,5 @@ class Builder extends cps_ir.Visitor<Node> {
   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(
-        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)]);
-  }
 }