Revert "Deoptimization support in inlined code."

runtime/vm/intermediate_language.cc

Index: runtime/vm/intermediate_language.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index 6a8a3e91b5b6d92473743d3892b412a4413e0c33..339b3eea6f85e2365dde8406e7c9c19ccc707740 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -1656,13 +1656,12 @@ void PushArgumentInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
 
 Environment* Environment::From(const GrowableArray<Definition*>& definitions,
                                intptr_t fixed_parameter_count,
-                               const Function& function) {
+                               const Environment* outer) {
   Environment* env =
       new Environment(definitions.length(),
                       fixed_parameter_count,
                       Isolate::kNoDeoptId,
-                      function,
-                      NULL);
+                      (outer == NULL) ? NULL : outer->DeepCopy());
   for (intptr_t i = 0; i < definitions.length(); ++i) {
     env->values_.Add(new Value(definitions[i]));
   }
@@ -1675,7 +1674,6 @@ Environment* Environment::DeepCopy() const {
       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());
@@ -1698,22 +1696,6 @@ void Environment::DeepCopyTo(Instruction* instr) const {
 }
 
 
-// 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