dart2dart: Support for inner functions in new IR.

sdk/lib/_internal/compiler/implementation/ir/ir_tracer.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 dart2js.ir_tracer;
 
 import 'dart:async' show EventSink;
 
 import 'ir_nodes.dart' as ir hide Function;
 import '../tracer.dart';
@@ skipping 176 matching lines @@
   }
 
   visitBranch(ir.Branch node) {
     String dummy = names.name(node);
     String condition = visit(node.condition);
     String trueCont = formatReference(node.trueContinuation);
     String falseCont = formatReference(node.falseContinuation);
     printStmt(dummy, "Branch $condition ($trueCont, $falseCont)");
   }
 
+  visitSetClosureVariable(ir.SetClosureVariable node) {
+    String dummy = names.name(node);
+    String variable = node.variable.name;
+    String value = formatReference(node.value);
+    printStmt(dummy, 'SetClosureVariable $variable = $value');
+    visit(node.body);
+  }
+
+  visitDeclareFunction(ir.DeclareFunction node) {
+    String dummy = names.name(node);
+    String variable = node.variable.name;
+    printStmt(dummy, 'DeclareFunction $variable');
+    visit(node.body);
+  }
+
   String formatReference(ir.Reference ref) {
     ir.Definition target = ref.definition;
     if (target is ir.Continuation && target.body == null) {
       return "return"; // Do not generate a name for the return continuation
     } else {
       return names.name(ref.definition);
     }
   }
 
   String formatPrimitive(ir.Primitive p) => visit(p);
@@ skipping 12 matching lines @@
 
   visitIsTrue(ir.IsTrue node) {
     return "IsTrue(${names.name(node.value.definition)})";
   }
 
   visitThis(ir.This node) {
     return "This";
   }
 
   visitReifyTypeVar(ir.ReifyTypeVar node) {
-    return "ReifyTypeVar ${node.element.name}";
+    return "ReifyTypeVar ${node.typeVariable.name}";
   }
 
+  visitCreateFunction(ir.CreateFunction node) {
+    return "CreateFunction ${node.definition.element.name}";
+  }
+
+  visitGetClosureVariable(ir.GetClosureVariable node) {
+    String variable = node.variable.name;
+    return 'GetClosureVariable $variable';
+  }
+
+
   visitCondition(ir.Condition c) {}
   visitExpression(ir.Expression e) {}
   visitPrimitive(ir.Primitive p) {}
   visitDefinition(ir.Definition d) {}
   visitNode(ir.Node n) {}
 }
 
 /**
  * Invents (and remembers) names for Continuations, Parameters, etc.
  * The names must match the conventions used by IR Hydra, e.g.
@@ skipping 69 matching lines @@
 
   visitLetPrim(ir.LetPrim exp) {
     visit(exp.body);
   }
 
   visitLetCont(ir.LetCont exp) {
     visit(exp.continuation);
     visit(exp.body);
   }
 
-  visitInvokeStatic(ir.InvokeStatic exp) {
-    ir.Definition target = exp.continuation.definition;
+  void addEdgeToContinuation(ir.Reference continuation) {
+    ir.Definition target = continuation.definition;
     if (target is ir.Continuation && target.body != null) {
       current_block.addEdgeTo(getBlock(target));
     }
   }
 
+  visitInvokeStatic(ir.InvokeStatic exp) {
+    addEdgeToContinuation(exp.continuation);
+  }
+
   visitInvokeMethod(ir.InvokeMethod exp) {
-    ir.Definition target = exp.continuation.definition;
-    if (target is ir.Continuation && target.body != null) {
-      current_block.addEdgeTo(getBlock(target));
-    }
+    addEdgeToContinuation(exp.continuation);
   }
 
   visitInvokeConstructor(ir.InvokeConstructor exp) {
-    ir.Definition target = exp.continuation.definition;
-    if (target is ir.Continuation && target.body != null) {
-      current_block.addEdgeTo(getBlock(target));
-    }
+    addEdgeToContinuation(exp.continuation);
   }
 
   visitConcatenateStrings(ir.ConcatenateStrings exp) {
-    ir.Definition target = exp.continuation.definition;
-    if (target is ir.Continuation && target.body != null) {
-      current_block.addEdgeTo(getBlock(target));
-    }
+    addEdgeToContinuation(exp.continuation);
   }
 
   visitInvokeContinuation(ir.InvokeContinuation exp) {
-    ir.Definition target = exp.continuation.definition;
-    if (target is ir.Continuation && target.body != null) {
-      current_block.addEdgeTo(getBlock(target));
-    }
+    addEdgeToContinuation(exp.continuation);
+  }
+
+  visitSetClosureVariable(ir.SetClosureVariable exp) {
+    visit(exp.body);
+  }
+
+  visitDeclareFunction(ir.DeclareFunction exp) {
+    visit(exp.body);
   }
 
   visitBranch(ir.Branch exp) {
     ir.Continuation trueTarget = exp.trueContinuation.definition;
     if (trueTarget.body != null) {
       current_block.addEdgeTo(getBlock(trueTarget));
     }
     ir.Continuation falseTarget = exp.falseContinuation.definition;
     if (falseTarget.body != null) {
       current_block.addEdgeTo(getBlock(falseTarget));
     }
   }
 
   visitContinuation(ir.Continuation c) {
     var old_node = current_block;
     current_block = getBlock(c);
     visit(c.body);
     current_block = old_node;
   }
 }