Fix this capturing in closures.

frog/leg/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 243 matching lines @@
     closureData = translator.translate(node);
 
     FunctionParameters params = function.computeParameters(builder.compiler);
     params.forEachParameter((Element element) {
       HParameterValue parameter = new HParameterValue(element);
       builder.add(parameter);
       // Note that for constructors [element] could be a field-element which we
       // treat as if it was a local.
       directLocals[element] = parameter;
     });
+    if (closureData.thisElement !== null) {
+      // Note that closures, once they are mapped to classes, might have
+      // instance-members that do *not* have any thisElement.

[ngeoffray, 2012/02/29 12:22:17]

Please explain why.

[floitsch, 2012/02/29 12:35:28]

Done.

+      assert(function.isInstanceMember() || function.isGenerativeConstructor());
+      // We have to introduce 'this' before we enter the scope, since it might
+      // need to be copied into a box (if it is captured). This is similar
+      // to all other parameters that are introduced.
+      HInstruction thisInstruction = new HThis();
+      builder.add(thisInstruction);
+      // directLocals[closureData.thisElement] = thisInstruction;

[ngeoffray, 2012/02/29 12:22:17]

Why is this commented out?

[floitsch, 2012/02/29 12:35:28]

this one is the correct one...

+      updateLocal(closureData.thisElement, thisInstruction);

[ngeoffray, 2012/02/29 12:22:17]

Why do you call updateLocal, and not use directLocals, like for parameters line
262.

[floitsch, 2012/02/29 12:35:28]

debug code...

+    }
 
     enterScope(node);
 
     // If the freeVariableMapping is not empty, then this function was a
     // nested closure that captures variables. Redirect the captured
     // variables to fields in the closure.
     closureData.freeVariableMapping.forEach((Element from, Element to) {
       redirectElement(from, to);
     });
     if (closureData.isClosure()) {
       // Inside closure redirect references to itself to [:this:].
       HInstruction thisInstruction = new HThis();
       builder.add(thisInstruction);
       updateLocal(closureData.closureElement, thisInstruction);
-    } else if (function.isInstanceMember() ||
-               function.isGenerativeConstructor()) {
-      HInstruction thisInstruction = new HThis();
-      builder.add(thisInstruction);
-      updateLocal(closureData.thisElement, thisInstruction);
     }
   }
 
   bool hasValueForDirectLocal(Element element) {
     assert(element !== null);
     assert(isAccessedDirectly(element));
     return directLocals[element] !== null;
   }
 
   /**
@@ skipping 2015 matching lines @@
   }
 
   visitCatchBlock(CatchBlock node) {
     visit(node.block);
   }
 
   visitTypedef(Typedef node) {
     compiler.unimplemented('SsaBuilder.visitTypedef', node: node);
   }
 }