Workaround for a compiler bug (see <rdar://problem/5852746>). Once that bug is

[oota-llvm.git] / include / llvm / Use.h

diff --git a/include/llvm/Use.h b/include/llvm/Use.h
index e817601f80cdda62bf433fe9fe30a65dff769bce..e050743ffdb0c3737c22a6e28cd16c8e94db2c28 100644 (file)
--- a/include/llvm/Use.h
+++ b/include/llvm/Use.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -37,7 +37,9 @@ public:
 
   Use(Value *V, User *U) { init(V, U); }
   Use(const Use &U) { init(U.Val, U.U); }
-  inline ~Use();
+  inline ~Use() {
+    if (Val) removeFromList();
+  }
 
   /// Default ctor - This leaves the Use completely unitialized.  The only thing
   /// that is valid to do with this use is to call the "init" method.
@@ -105,7 +107,7 @@ class value_use_iterator : public forward_iterator<UserTy*, ptrdiff_t> {
   typedef value_use_iterator<UserTy> _Self;
 
   Use *U;
-  value_use_iterator(Use *u) : U(u) {}
+  explicit value_use_iterator(Use *u) : U(u) {}
   friend class Value;
 public:
   typedef typename super::reference reference;
@@ -121,6 +123,9 @@ public:
     return !operator==(x);
   }
 
+  /// atEnd - return true if this iterator is equal to use_end() on the value.
+  bool atEnd() const { return U == 0; }
+
   // Iterator traversal: forward iteration only
   _Self &operator++() {          // Preincrement
     assert(U && "Cannot increment end iterator!");
@@ -131,7 +136,7 @@ public:
     _Self tmp = *this; ++*this; return tmp;
   }
 
-  // Retrieve a reference to the current SCC
+  // Retrieve a reference to the current User
   UserTy *operator*() const {
     assert(U && "Cannot increment end iterator!");
     return U->getUser();
@@ -141,11 +146,10 @@ public:
 
   Use &getUse() const { return *U; }
   
-  /// getOperandNo - Return the operand # of this use in its User.
+  /// getOperandNo - Return the operand # of this use in its User.  Defined in
+  /// User.h
   ///
-  unsigned getOperandNo() const {
-    return U - U->getUser()->op_begin();
-  }
+  unsigned getOperandNo() const;
 };