Set previous instruction pointers when building the graph.

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 221 matching lines @@
   ASSERT(!IsControl());
   ASSERT(!IsThrow());
   ASSERT(!IsReturn());
   ASSERT(!IsReThrow());
   ASSERT(!IsGoto());
   ASSERT(previous() != NULL);
   Instruction* prev_instr = previous();
   Instruction* next_instr = next();
   ASSERT(next_instr != NULL);
   ASSERT(!next_instr->IsBlockEntry());
-  prev_instr->set_next(next_instr);
-  next_instr->set_previous(prev_instr);
+  prev_instr->LinkTo(next_instr);
   // Reset successor and previous instruction to indicate
   // that the instruction is removed from the graph.
   set_previous(NULL);
   set_next(NULL);
   return return_previous ? prev_instr : next_instr;
 }
 
 
 void Instruction::InsertBefore(Instruction* next) {
   ASSERT(previous_ == NULL);
@@ skipping 328 matching lines @@
   if ((iterator != NULL) && (this == iterator->Current())) {
     iterator->ReplaceCurrentWith(other);
   } 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());
 
-    other->set_previous(previous());
-    previous()->set_next(other);
+    previous()->LinkTo(other);
+    other->LinkTo(next());
+
     set_previous(NULL);
-
-    other->set_next(next());
-    next()->set_previous(other);
     set_next(NULL);
   }
 }
 
 
 bool Definition::SetPropagatedCid(intptr_t cid) {
   if (cid == kIllegalCid) {
     return false;
   }
   if (propagated_cid_ == kIllegalCid) {
@@ skipping 265 matching lines @@
 }
 
 
 BlockEntryInstr* GotoInstr::SuccessorAt(intptr_t index) const {
   ASSERT(index == 0);
   return successor();
 }
 
 
 void Instruction::Goto(JoinEntryInstr* entry) {
-  set_next(new GotoInstr(entry));
+  LinkTo(new GotoInstr(entry));
 }
 
 
 RawAbstractType* Value::CompileType() const {
   if (definition()->HasPropagatedType()) {
     return definition()->PropagatedType();
   }
   // The compile type may be requested when building the flow graph, i.e. before
   // type propagation has occurred. To avoid repeatedly computing the compile
   // type of the definition, we store it as initial propagated type.
@@ skipping 1172 matching lines @@
     new_max = new_max.Clamp();
   }
 
   return Range::Update(&range_, new_min, new_max);
 }
 
 
 #undef __
 
 }  // namespace dart