Fix bug with captured parameters and optimized try-catch.

runtime/vm/flow_graph_compiler.cc

Index: runtime/vm/flow_graph_compiler.cc
===================================================================
--- runtime/vm/flow_graph_compiler.cc	(revision 41095)
+++ runtime/vm/flow_graph_compiler.cc	(working copy)
@@ -411,6 +411,8 @@
   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 the environment.

[srdjan, 2014/10/14 13:45:09]

s/not the environment/ not in the environment/   ; also below.

[Florian Schneider, 2014/10/14 14:44:01]

Done.

+    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;
@@ -423,6 +425,8 @@
   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 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);