dart2dart: Bugfix in copy propagator.

pkg/compiler/lib/src/tree_ir/tree_ir_builder.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 tree_ir_builder;
 
 import '../dart2jslib.dart' as dart2js;
 import '../dart_types.dart';
 import '../elements/elements.dart';
 import '../cps_ir/cps_ir_nodes.dart' as cps_ir;
@@ skipping 64 matching lines @@
 
   Builder createInnerBuilder() {
     return new Builder(internalError, this);
   }
 
   /// Variable used in [buildPhiAssignments] as a temporary when swapping
   /// variables.
   Variable phiTempVar;
 
   Variable addMutableVariable(cps_ir.MutableVariable irVariable) {
-    if (irVariable.host != currentElement) {
-      return parent.addMutableVariable(irVariable);
-    }
+    assert(irVariable.host == currentElement);
     assert(!local2mutable.containsKey(irVariable));
     Variable variable = new Variable(currentElement, irVariable.hint);
     local2mutable[irVariable] = variable;
     return variable;
   }
 
   Variable getMutableVariable(cps_ir.MutableVariable mutableVariable) {
     if (mutableVariable.host != currentElement) {
-      return parent.getMutableVariable(mutableVariable);
+      return parent.getMutableVariable(mutableVariable)..isCaptured = true;
     }
     return local2mutable[mutableVariable];
   }
 
   VariableUse getMutableVariableUse(
         cps_ir.Reference<cps_ir.MutableVariable> reference) {
     Variable variable = getMutableVariable(reference.definition);
     return new VariableUse(variable);
   }
 
@@ skipping 366 matching lines @@
       Function nextBuilder = cont.hasExactlyOneUse ?
           () => visit(cont.body) : () => new Break(labels[cont]);
       return buildContinuationAssignment(cont.parameters.single, expression,
           nextBuilder);
     }
   }
 
   Statement visitLetMutable(cps_ir.LetMutable node) {
     Variable variable = addMutableVariable(node.variable);
     Expression value = getVariableUse(node.value);
-    return new Assign(variable, value, visit(node.body), isDeclaration: true);
+    Statement body = visit(node.body);
+    // If the variable was captured by an inner function in the body, this
+    // must be declared here so we assign to a fresh copy of the variable.
+    bool needsDeclaration = variable.isCaptured;
+    return new Assign(variable, value, body, isDeclaration: needsDeclaration);
   }
 
   Expression visitGetMutableVariable(cps_ir.GetMutableVariable node) {
     return getMutableVariableUse(node.variable);
   }
 
   Statement visitSetMutableVariable(cps_ir.SetMutableVariable node) {
     Variable variable = getMutableVariable(node.variable.definition);
     Expression value = getVariableUse(node.value);
     return new Assign(variable, value, visit(node.body));
@@ skipping 144 matching lines @@
   }
 
   Expression visitReifyRuntimeType(cps_ir.ReifyRuntimeType node) {
     return new ReifyRuntimeType(getVariableUse(node.value));
   }
 
   Expression visitReadTypeVariable(cps_ir.ReadTypeVariable node) {
     return new ReadTypeVariable(node.variable, getVariableUse(node.target));
   }
 }