Fix bug with captured parameters and optimized try-catch.

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2013, 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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
@@ skipping 393 matching lines @@
   // Construct a ParallelMove instruction for parameters and locals. Skip the
   // special locals exception_var and stacktrace_var since they will be filled
   // when an exception is thrown. Constant locations are known to be the same
   // at all instructions that may throw, and do not need to be materialized.
 
   // Parameters first.
   intptr_t i = 0;
   const intptr_t num_non_copied_params = flow_graph().num_non_copied_params();
   ParallelMoveInstr* move_instr = new ParallelMoveInstr();
   for (; i < num_non_copied_params; ++i) {
+    // Don't sync captured parameters. They are not in the environment.
+    if (flow_graph().captured_parameters()->Contains(i)) continue;
     if ((*idefs)[i]->IsConstant()) continue;  // Common constants
     Location src = env->LocationAt(i);
     intptr_t dest_index = i - num_non_copied_params;
     Location dest = Location::StackSlot(dest_index);
     move_instr->AddMove(dest, src);
   }
 
   // Process locals. Skip exception_var and stacktrace_var.
   intptr_t local_base = kFirstLocalSlotFromFp + num_non_copied_params;
   intptr_t ex_idx = local_base - catch_block->exception_var().index();
   intptr_t st_idx = local_base - catch_block->stacktrace_var().index();
   for (; i < flow_graph().variable_count(); ++i) {
+    // Don't sync captured parameters. They are not in the environment.
+    if (flow_graph().captured_parameters()->Contains(i)) continue;
     if (i == ex_idx || i == st_idx) continue;
     if ((*idefs)[i]->IsConstant()) continue;
     Location src = env->LocationAt(i);
     ASSERT(!src.IsFpuRegister());
     ASSERT(!src.IsDoubleStackSlot());
     intptr_t dest_index = i - num_non_copied_params;
     Location dest = Location::StackSlot(dest_index);
     move_instr->AddMove(dest, src);
     // Update safepoint bitmap to indicate that the target location
     // now contains a pointer.
@@ skipping 1051 matching lines @@
     threshold = FLAG_optimization_counter_scale * basic_blocks +
         FLAG_min_optimization_counter_threshold;
     if (threshold > FLAG_optimization_counter_threshold) {
       threshold = FLAG_optimization_counter_threshold;
     }
   }
   return threshold;
 }
 
 }  // namespace dart