VM: Explicitly load function and context before calling a closure.

runtime/vm/flow_graph.cc

 // 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.
 
 #include "vm/flow_graph.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 460 matching lines @@
           last_loads->Add(index);
           load->mark_last();
         }
         continue;
       }
 
       StoreLocalInstr* store = current->AsStoreLocal();
       if (store != NULL) {
         const intptr_t index =
             store->local().BitIndexIn(num_non_copied_params_);
+        if (index >= live_in->length()) continue;  // Skip tmp_locals.
         if (kill->Contains(index)) {
           if (!live_in->Contains(index)) {
             store->mark_dead();
           }
         } else {
           if (!live_in->Contains(index)) {
             store->mark_last();
           }
           kill->Add(index);
         }
@@ skipping 258 matching lines @@
   RenameRecursive(entry, &env, live_phis, variable_liveness);
 }
 
 
 void FlowGraph::AttachEnvironment(Instruction* instr,
                                   GrowableArray<Definition*>* env) {
   Environment* deopt_env =
       Environment::From(*env,
                         num_non_copied_params_,
                         Code::Handle(parsed_function_.code()));
+  // TODO(fschneider): Add predicates CanEagerlyDeoptimize and
+  // CanLazilyDeoptimize to instructions to generally deal with instructions
+  // that have pushed arguments and input operands.
+  // Right now, closure calls are the only instructions that have both. They
+  // also don't have an eager deoptimziation point, so the environment attached
+  // here is only used for after the call.
+  if (instr->IsClosureCall()) {
+    deopt_env = deopt_env->DeepCopy(deopt_env->Length() - instr->InputCount());
+  }
   instr->SetEnvironment(deopt_env);
   for (Environment::DeepIterator it(deopt_env); !it.Done(); it.Advance()) {
     Value* use = it.CurrentValue();
     use->definition()->AddEnvUse(use);
   }
   if (instr->CanDeoptimize()) {
     instr->env()->set_deopt_id(instr->deopt_id());
   }
 }
 
@@ skipping 449 matching lines @@
 }
 
 
 bool BlockEffects::IsSideEffectFreePath(BlockEntryInstr* from,
                                         BlockEntryInstr* to) const {
   return available_at_[to->postorder_number()]->Contains(
       from->postorder_number());
 }
 
 }  // namespace dart