[C++11] More 'nullptr' conversion or in some cases just using a boolean check instead...

[oota-llvm.git] / include / llvm / IR / User.h

diff --git a/include/llvm/IR/User.h b/include/llvm/IR/User.h
index 7d3fb494adddf51f2bb9e3774e92b88cd56bbfd9..abe68221df7b0f5a0088111f587a8beeaf0d4e77 100644 (file)
--- a/include/llvm/IR/User.h
+++ b/include/llvm/IR/User.h
@@ -55,7 +55,7 @@ protected:
   Use *allocHungoffUses(unsigned) const;
   void dropHungoffUses() {
     Use::zap(OperandList, OperandList + NumOperands, true);
-    OperandList = 0;
+    OperandList = nullptr;
     // Reset NumOperands so User::operator delete() does the right thing.
     NumOperands = 0;
   }
@@ -121,10 +121,10 @@ public:
   inline op_iterator       op_end()         { return OperandList+NumOperands; }
   inline const_op_iterator op_end()   const { return OperandList+NumOperands; }
   inline op_range operands() {
-    return {op_begin(), op_end()};
+    return op_range(op_begin(), op_end());
   }
   inline const_op_range operands() const {
-    return {op_begin(), op_end()};
+    return const_op_range(op_begin(), op_end());
   }
 
   /// Convenience iterator for directly iterating over the Values in the
@@ -166,7 +166,7 @@ public:
     return value_op_iterator(op_end());
   }
   inline iterator_range<value_op_iterator> operand_values() {
-    return {value_op_begin(), value_op_end()};
+    return iterator_range<value_op_iterator>(value_op_begin(), value_op_end());
   }
 
   // dropAllReferences() - This function is in charge of "letting go" of all
@@ -178,8 +178,8 @@ public:
   // delete.
   //
   void dropAllReferences() {
-    for (op_iterator i = op_begin(), e = op_end(); i != e; ++i)
-      i->set(0);
+    for (Use &U : operands())
+      U.set(nullptr);
   }
 
   /// replaceUsesOfWith - Replaces all references to the "From" definition with
@@ -206,12 +206,6 @@ template<> struct simplify_type<User::const_op_iterator> {
   }
 };
 
-// value_use_iterator::getOperandNo - Requires the definition of the User class.
-template<typename UserTy>
-unsigned value_use_iterator<UserTy>::getOperandNo() const {
-  return U - U->getUser()->op_begin();
-}
-
 } // End llvm namespace
 
 #endif