Reapply "Deoptimization support in inlined code."

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 1635 matching lines @@
   // TODO(fschneider): Avoid special-casing for SSA mode here.
   if (compiler->is_optimizing()) {
     ASSERT(locs()->in(0).IsRegister());
     __ PushRegister(locs()->in(0).reg());
   }
 }
 
 
 Environment* Environment::From(const GrowableArray<Definition*>& definitions,
                                intptr_t fixed_parameter_count,
-                               const Environment* outer) {
+                               const Function& function) {
   Environment* env =
       new Environment(definitions.length(),
                       fixed_parameter_count,
                       Isolate::kNoDeoptId,
-                      (outer == NULL) ? NULL : outer->DeepCopy());
+                      function,
+                      NULL);
   for (intptr_t i = 0; i < definitions.length(); ++i) {
     env->values_.Add(new Value(definitions[i]));
   }
   return env;
 }
 
 
 Environment* Environment::DeepCopy() const {
   Environment* copy =
       new Environment(values_.length(),
                       fixed_parameter_count_,
                       deopt_id_,
+                      function_,
                       (outer_ == NULL) ? NULL : outer_->DeepCopy());
   for (intptr_t i = 0; i < values_.length(); ++i) {
     copy->values_.Add(values_[i]->Copy());
   }
   return copy;
 }
 
 
 // Copies the environment and updates the environment use lists.
 void Environment::DeepCopyTo(Instruction* instr) const {
   Environment* copy = DeepCopy();
   intptr_t use_index = 0;
   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->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();
+  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;
+}
+
+
 #undef __
 
 }  // namespace dart