Remove caller arguments from nested deoptimization environments.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 1810 matching lines @@
     value->AddToEnvUseList();
   }
   instr->set_env(copy);
 }
 
 
 // Copies the environment as outer on an inlined instruction and updates the
 // environment use lists.
 void Environment::DeepCopyToOuter(Instruction* instr) const {
   ASSERT(instr->env()->outer() == NULL);
-  Environment* copy = DeepCopy();
+  // Create a deep copy removing caller arguments from the environment.
+  intptr_t argument_count = instr->env()->fixed_parameter_count();
+  Environment* copy =
+      new Environment(values_.length() - argument_count,
+                      fixed_parameter_count_,
+                      deopt_id_,
+                      function_,
+                      (outer_ == NULL) ? NULL : outer_->DeepCopy());
+  for (intptr_t i = 0; i < values_.length() - argument_count; ++i) {
+    copy->values_.Add(values_[i]->Copy());
+  }
   intptr_t use_index = instr->env()->Length();  // Start index after inner.
   for (Environment::DeepIterator it(copy); !it.Done(); it.Advance()) {
     Value* value = it.CurrentValue();
     value->set_instruction(instr);
     value->set_use_index(use_index++);
     value->AddToEnvUseList();
   }
   instr->env()->outer_ = copy;
 }
 
@@ skipping 138 matching lines @@
 
   ASSERT(!new_min.IsUnknown() && !new_max.IsUnknown());
   set_overflow(new_min.Overflowed() || new_max.Overflowed());
   return Range::Update(&range_, new_min, new_max);
 }
 
 
 #undef __
 
 }  // namespace dart