Prototype re-compiling methods in dart2js

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 1475 matching lines @@
             wrapExpressionGraph(conditionExpression),
             wrapStatementGraph(bodyGraph),
             null,
             loopEntryBlock.loopInformation.target,
             loopEntryBlock.loopInformation.labels);
     loopEntryBlock.setBlockFlow(loopBlockInfo, current);
     loopInfo.loopBlockInformation = loopBlockInfo;
   }
 
   visitFunctionExpression(FunctionExpression node) {
+    if (compiler.pass == 2) {
+      throw new Pass2BailoutException("visitFunctionExpression");
+    }
     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);
     }
     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());
+    if (compiler.pass == 1) {

[floitsch, 2012/06/07 10:59:39]

Shouldn't be needed: we bailout earlier, and even if we didn't the enqueuer
should deal gracefully with multiple addToWorkList.

[Søren Gjesse, 2012/06/13 10:55:09]

Removed. Actually the bailout is also removed but the check is still not needed.

+      // 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());
+    }
 
     List<HInstruction> capturedVariables = <HInstruction>[];
     for (Element member in closureClassElement.backendMembers) {
       // The backendMembers also contains the call method(s). We are only
       // interested in the fields.
       if (member.kind == ElementKind.FIELD) {
         Element capturedLocal = nestedClosureData.capturedFieldMapping[member];
         assert(capturedLocal != null);
         capturedVariables.add(localsHandler.readLocal(capturedLocal));
       }
@@ skipping 1907 matching lines @@
   void visitNodeList(NodeList node) {
      node.visitChildren(this);
   }
 
   HInstruction concat(HInstruction left, HInstruction right) {
     HInstruction instruction = new HStringConcat(left, right);
     builder.add(instruction);
     return instruction;
   }
 }