Convert some compiler passes to preserve valid def-use chains.

runtime/vm/intermediate_language.cc

 // Copyright (c) 2013, 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 359 matching lines @@
   return result->AsBlockEntry();
 }
 
 
 void ForwardInstructionIterator::RemoveCurrentFromGraph() {
   current_ = current_->RemoveFromGraph(true);  // Set current_ to previous.
 }
 
 
 void ForwardInstructionIterator::ReplaceCurrentWith(Definition* other) {
-  Definition* defn = current_->AsDefinition();

[Vyacheslav Egorov (Google), 2013/02/08 16:44:49]

This must come back before you will land it.

[Kevin Millikin (Google), 2013/02/19 10:49:30]

Thanks, it was an inadvertent deletion.

-  ASSERT(defn != NULL);
-  defn->ReplaceUsesWith(other);
-  ASSERT(other->env() == NULL);
-  other->set_env(defn->env());
-  defn->set_env(NULL);
-  ASSERT(!other->HasSSATemp());
-  if (defn->HasSSATemp()) other->set_ssa_temp_index(defn->ssa_temp_index());
-
-  other->InsertBefore(current_);  // So other will be current.
-  RemoveCurrentFromGraph();
 }
 
 
 // Default implementation of visiting basic blocks.  Can be overridden.
 void FlowGraphVisitor::VisitBlocks() {
   ASSERT(current_iterator_ == NULL);
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     BlockEntryInstr* entry = block_order_[i];
     entry->Accept(this);
     ForwardInstructionIterator it(entry);
@@ skipping 300 matching lines @@
     InputAt(i)->RemoveFromUseList();
   }
   for (Environment::DeepIterator it(env()); !it.Done(); it.Advance()) {
     it.CurrentValue()->RemoveFromUseList();
   }
 }
 
 
 void Definition::ReplaceWith(Definition* other,
                              ForwardInstructionIterator* iterator) {
+  // Record other's input uses.
+  for (intptr_t i = other->InputCount() - 1; i >= 0; --i) {
+    Value* input = other->InputAt(i);
+    input->definition()->AddInputUse(input);
+    input->set_instruction(other);
+    input->set_use_index(i);
+  }
+  // Take other's environment from this definition.
+  ASSERT(other->env() == NULL);
+  intptr_t use_index = 0;
+  for (Environment::DeepIterator it(env()); !it.Done(); it.Advance()) {
+    Value* use = it.CurrentValue();
+    use->set_instruction(other);
+    use->set_use_index(use_index++);
+  }
+  other->set_env(env());
+  set_env(NULL);
+  // Replace all uses of this definition with other.
+  ReplaceUsesWith(other);
+  // Reuse this instruction's SSA name for other.
+  ASSERT(!other->HasSSATemp());
+  if (HasSSATemp()) other->set_ssa_temp_index(ssa_temp_index());
+  // Remove this definition's input uses.
+  UnuseAllInputs();
+
+  // Finally remove this definition from the graph.
+  previous()->LinkTo(other);
   if ((iterator != NULL) && (this == iterator->Current())) {
-    iterator->ReplaceCurrentWith(other);
+    // Remove through the iterator.
+    other->LinkTo(this);
+    iterator->RemoveCurrentFromGraph();
   } else {
-    ReplaceUsesWith(other);
-    ASSERT(other->env() == NULL);
-    other->set_env(env());
-    set_env(NULL);
-    ASSERT(!other->HasSSATemp());
-    if (HasSSATemp()) other->set_ssa_temp_index(ssa_temp_index());
-
-    previous()->LinkTo(other);
     other->LinkTo(next());
-
-    set_previous(NULL);
-    set_next(NULL);
   }
+  set_previous(NULL);
+  set_next(NULL);
 }
 
 
 bool Definition::SetPropagatedCid(intptr_t cid) {
   if (cid == kIllegalCid) {
     return false;
   }
   if (propagated_cid_ == kIllegalCid) {
     // First setting, nothing has changed.
     propagated_cid_ = cid;
@@ skipping 1009 matching lines @@
 Definition* LoadFieldInstr::Canonicalize(FlowGraphOptimizer* optimizer) {
   if (!IsImmutableLengthLoad()) return this;
 
   // For fixed length arrays if the array is the result of a known constructor
   // call we can replace the length load with the length argument passed to
   // the constructor.
   StaticCallInstr* call = value()->definition()->AsStaticCall();
   if (call != NULL &&
       call->is_known_constructor() &&
       call->ResultCid() == kArrayCid) {
-    return call->ArgumentAt(1)->value()->definition();
+    return call->ArgumentAt(1);
   }
   return this;
 }
 
 
 Definition* AssertBooleanInstr::Canonicalize(FlowGraphOptimizer* optimizer) {
   const intptr_t value_cid = value()->ResultCid();
   return (value_cid == kBoolCid) ? value()->definition() : this;
 }
 
@@ skipping 54 matching lines @@
     Definition* replacement = comparison()->Canonicalize(optimizer);
     if (replacement == comparison() || replacement == NULL) return this;
     ComparisonInstr* comp = replacement->AsComparison();
     if (comp == NULL) return this;
 
     // Replace the comparison if the replacement is used at this branch,
     // and has exactly one use.
     if ((comp->input_use_list()->instruction() == this) &&
         (comp->input_use_list()->next_use() == NULL) &&
         (comp->env_use_list() == NULL)) {
+      comparison()->UnuseAllInputs();
       comp->RemoveFromGraph();
       // It is safe to pass a NULL iterator because we're replacing the
       // comparison wrapped in a BranchInstr which does not modify the
       // linked list of instructions.
       ReplaceWith(comp, NULL /* ignored */);
       for (intptr_t i = 0; i < comp->InputCount(); ++i) {
         Value* operand = comp->InputAt(i);
         operand->set_instruction(this);
       }
       if (FLAG_trace_optimization) {
         OS::Print("Merging comparison v%"Pd"\n", comp->ssa_temp_index());
       }
-      // Clear the comparison's use list, temp index and ssa temp index since
-      // the value of the comparison is not used outside the branch anymore.
-      comp->set_input_use_list(NULL);
+      // Clear the comparison's temp index and ssa temp index since the
+      // value of the comparison is not used outside the branch anymore.
+      ASSERT(comp->input_use_list() == NULL);
       comp->ClearSSATempIndex();
       comp->ClearTempIndex();
     }
   }
   return this;
 }
 
 
 Definition* StrictCompareInstr::Canonicalize(FlowGraphOptimizer* optimizer) {
   if (!right()->BindsToConstant()) return this;
@@ skipping 1012 matching lines @@
     default:
       UNREACHABLE();
   }
   return kPowRuntimeEntry;
 }
 
 
 #undef __
 
 }  // namespace dart