Move recording of definition used from the value to the definition.

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 76 matching lines @@
 
   Value* next_use() const { return next_use_; }
   void set_next_use(Value* next) { next_use_ = next; }
 
   Instruction* instruction() const { return instruction_; }
   void set_instruction(Instruction* instruction) { instruction_ = instruction; }
 
   intptr_t use_index() const { return use_index_; }
   void set_use_index(intptr_t index) { use_index_ = index; }
 
-  void AddToInputUseList();
-  void AddToEnvUseList();
-
-  void RemoveFromInputUseList();
+  static void AddToList(Value* value, Value** list);
+  static void RemoveFromList(Value* value, Value** list);
 
   Value* Copy() { return new Value(definition_); }
 
   RawAbstractType* CompileType() const;
   intptr_t ResultCid() const;
 
   void PrintTo(BufferFormatter* f) const;
 
   const char* DebugName() const { return "Value"; }
 
@@ skipping 991 matching lines @@
   bool HasUses() const {
     return (input_use_list_ != NULL) || (env_use_list_ != NULL);
   }
 
   Value* input_use_list() const { return input_use_list_; }
   void set_input_use_list(Value* head) { input_use_list_ = head; }
 
   Value* env_use_list() const { return env_use_list_; }
   void set_env_use_list(Value* head) { env_use_list_ = head; }
 
+  void AddInputUse(Value* value) { Value::AddToList(value, &input_use_list_); }
+  void AddEnvUse(Value* value) { Value::AddToList(value, &env_use_list_); }
+
+  void RemoveInputUse(Value* value) {
+    Value::RemoveFromList(value, &input_use_list_);
+  }
+
   // Replace uses of this definition with uses of other definition or value.
   // Precondition: use lists must be properly calculated.
   // Postcondition: use lists and use values are still valid.
   void ReplaceUsesWith(Definition* other);
 
   // Replace this definition and all uses with another definition.  If
   // replacing during iteration, pass the iterator so that the instruction
   // can be replaced without affecting iteration order, otherwise pass a
   // NULL iterator.
   void ReplaceWith(Definition* other, ForwardInstructionIterator* iterator);
@@ skipping 681 matching lines @@
 
   Value* value() const { return inputs_[0]; }
   Range* constraint() const { return constraint_; }
 
   virtual void InferRange();
 
   void AddDependency(Definition* defn) {
     Value* val = new Value(defn);
     val->set_use_index(1);
     val->set_instruction(this);
-    val->AddToInputUseList();
+    defn->AddInputUse(val);
     set_dependency(val);
   }
 
   void RemoveDependency() {
     if (dependency() != NULL) {
-      dependency()->RemoveFromInputUseList();
+      dependency()->definition()->RemoveInputUse(dependency());
       set_dependency(NULL);
     }
   }
 
  private:
   Value* dependency() {
     return inputs_[1];
   }
 
   void set_dependency(Value* value) {
@@ skipping 2640 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_