Make the closure-to-class translator more accessible. It can now be

lib/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, 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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 115 matching lines @@
     return compiler.findHelper(const SourceString('setRuntimeTypeInfo'));
   }
 
   Element getGetRuntimeTypeInfo() {
     return compiler.findHelper(const SourceString('getRuntimeTypeInfo'));
   }
 }
 
 class SsaBuilderTask extends CompilerTask {
   final Interceptors interceptors;
-  final Map<Node, ClosureData> closureDataCache;
   final CodeEmitterTask emitter;
   // Loop tracking information.
   final Set<FunctionElement> functionsCalledInLoop;
   final Map<SourceString, Selector> selectorsCalledInLoop;
   final JavaScriptBackend backend;
 
   String get name() => 'SSA builder';
 
   SsaBuilderTask(JavaScriptBackend backend)
     : interceptors = new Interceptors(backend.compiler),
-      closureDataCache = new HashMap<Node, ClosureData>(),
       emitter = backend.emitter,
       functionsCalledInLoop = new Set<FunctionElement>(),
       selectorsCalledInLoop = new Map<SourceString, Selector>(),
       backend = backend,
       super(backend.compiler);
 
   HGraph build(WorkItem work) {
     return measure(() {
       FunctionElement element = work.element;
       HInstruction.idCounter = 0;
@@ skipping 61 matching lines @@
  * too.
  */
 class LocalsHandler {
   /**
    * The values of locals that can be directly accessed (without redirections
    * to boxes or closure-fields).
    */
   Map<Element, HInstruction> directLocals;
   Map<Element, Element> redirectionMapping;
   SsaBuilder builder;
-  ClosureData closureData;
+  ClosureToClassMapping closureData;
 
   LocalsHandler(this.builder)
       : directLocals = new Map<Element, HInstruction>(),
         redirectionMapping = new Map<Element, Element>();
 
   get typesTask() => builder.compiler.typesTask;
 
   /**
    * Creates a new [LocalsHandler] based on [other]. We only need to
    * copy the [directLocals], since the other fields can be shared
@@ skipping 75 matching lines @@
       updateLocal(boxElement, oldBox);
       HInstruction oldValue = readLocal(boxedVariable);
       updateLocal(boxElement, newBox);
       updateLocal(boxedVariable, oldValue);
     }
     updateLocal(boxElement, newBox);
   }
 
   void startFunction(FunctionElement function,
                      FunctionExpression node) {
+    Compiler compiler = builder.compiler;
+    closureData = compiler.closureToClassMapper.computeClosureToClassMapping(
+            node, builder.elements);
 
-    ClosureTranslator translator = new ClosureTranslator(builder);
-    closureData = translator.translate(node);
-
-    FunctionSignature signature = function.computeSignature(builder.compiler);
+    FunctionSignature signature = function.computeSignature(compiler);
     signature.forEachParameter((Element element) {
       HInstruction parameter = new HParameterValue(element);
       builder.add(parameter);
       builder.parameters[element] = parameter;
       directLocals[element] = parameter;
       parameter.guaranteedType =
         builder.mapInferredType(typesTask.getGuaranteedTypeOfElement(element));
     });
 
     enterScope(node);
@@ skipping 1201 matching lines @@
             wrapStatementGraph(bodyGraph),
             null,
             loopEntryBlock.loopInformation.target,
             loopEntryBlock.loopInformation.labels,
             node);
     loopEntryBlock.setBlockFlow(loopBlockInfo, current);
     loopInfo.loopBlockInformation = loopBlockInfo;
   }
 
   visitFunctionExpression(FunctionExpression node) {
-    ClosureData nestedClosureData = builder.closureDataCache[node];
-    if (nestedClosureData === null) {
-      // TODO(floitsch): we can only assume that the reason for not having a
-      // closure data here is, because the function is inside an initializer.
-      compiler.unimplemented("Closures inside initializers", node: node);
-    }
+    ClosureToClassMapping nestedClosureData =
+        compiler.closureToClassMapper.getMappingForNestedFunction(node);
     assert(nestedClosureData !== null);
     assert(nestedClosureData.closureClassElement !== null);
     ClassElement closureClassElement =
         nestedClosureData.closureClassElement;
     FunctionElement callElement = nestedClosureData.callElement;
     // TODO(ahe): This should be registered in codegen, not here.
     compiler.enqueuer.codegen.addToWorkList(callElement, elements);
     // TODO(ahe): This should be registered in codegen, not here.
     compiler.enqueuer.codegen.registerInstantiatedClass(closureClassElement);
     assert(closureClassElement.members.isEmpty());
@@ skipping 2047 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }