Revert "Deoptimization support in inlined code."

runtime/vm/flow_graph_allocator.cc

Index: runtime/vm/flow_graph_allocator.cc
diff --git a/runtime/vm/flow_graph_allocator.cc b/runtime/vm/flow_graph_allocator.cc
index bd6524491255e9145fb6a56c2abd053b539d7e45..2118c08fb44d5cee13d1d9f4921779269795ed71 100644
--- a/runtime/vm/flow_graph_allocator.cc
+++ b/runtime/vm/flow_graph_allocator.cc
@@ -149,10 +149,8 @@ void FlowGraphAllocator::ComputeInitialSets() {
       // Add non-argument uses from the deoptimization environment (pushed
       // arguments are not allocated by the register allocator).
       if (current->env() != NULL) {
-        for (Environment::DeepIterator env_it(current->env());
-             !env_it.Done();
-             env_it.Advance()) {
-          Value* value = env_it.CurrentValue();
+        for (intptr_t i = 0; i < current->env()->Length(); ++i) {
+          Value* value = current->env()->ValueAt(i);
           if (!value->definition()->IsPushArgument()) {
             live_in->Add(value->definition()->ssa_temp_index());
           }
@@ -740,53 +738,49 @@ void FlowGraphAllocator::ConnectIncomingPhiMoves(BlockEntryInstr* block) {
 void FlowGraphAllocator::ProcessEnvironmentUses(BlockEntryInstr* block,
                                                 Instruction* current) {
   ASSERT(current->env() != NULL);
+
   Environment* env = current->env();
-  while (env != NULL) {
-    // Any value mentioned in the deoptimization environment should survive
-    // until the end of instruction but it does not need to be in the register.
-    // Expected shape of live range:
-    //
-    //                 i  i'
-    //      value    -----*
-    //
 
-    if (env->Length() == 0) {
-      env = env->outer();
-      continue;
-    }
+  // Any value mentioned in the deoptimization environment should survive
+  // until the end of instruction but it does not need to be in the register.
+  // Expected shape of live range:
+  //
+  //                 i  i'
+  //      value    -----*
+  //
 
-    const intptr_t block_start_pos = block->start_pos();
-    const intptr_t use_pos = current->lifetime_position() + 1;
+  if (env->Length() == 0) return;
 
-    Location* locations =
-        Isolate::Current()->current_zone()->Alloc<Location>(env->Length());
+  const intptr_t block_start_pos = block->start_pos();
+  const intptr_t use_pos = current->lifetime_position() + 1;
 
-    for (intptr_t i = 0; i < env->Length(); ++i) {
-      Value* value = env->ValueAt(i);
-      locations[i] = Location::Any();
-      Definition* def = value->definition();
+  Location* locations =
+      Isolate::Current()->current_zone()->Alloc<Location>(env->Length());
 
-      if (def->IsPushArgument()) {
-        // Frame size is unknown until after allocation.
-        locations[i] = Location::NoLocation();
-        continue;
-      }
+  for (intptr_t i = 0; i < env->Length(); ++i) {
+    Value* value = env->ValueAt(i);
+    locations[i] = Location::Any();
+    Definition* def = value->definition();
 
-      ConstantInstr* constant = def->AsConstant();
-      if (constant != NULL) {
-        locations[i] = Location::Constant(constant->value());
-        continue;
-      }
+    if (def->IsPushArgument()) {
+      // Frame size is unknown until after allocation.
+      locations[i] = Location::NoLocation();
+      continue;
+    }
 
-      const intptr_t vreg = def->ssa_temp_index();
-      LiveRange* range = GetLiveRange(vreg);
-      range->AddUseInterval(block_start_pos, use_pos);
-      range->AddUse(use_pos, &locations[i]);
+    ConstantInstr* constant = def->AsConstant();
+    if (constant != NULL) {
+      locations[i] = Location::Constant(constant->value());
+      continue;
     }
 
-    env->set_locations(locations);
-    env = env->outer();
+    const intptr_t vreg = def->ssa_temp_index();
+    LiveRange* range = GetLiveRange(vreg);
+    range->AddUseInterval(block_start_pos, use_pos);
+    range->AddUse(use_pos, &locations[i]);
   }
+
+  env->set_locations(locations);
 }