verify-di: Implement DebugInfoVerifier

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

diff --git a/include/llvm/IR/Metadata.h b/include/llvm/IR/Metadata.h
index 27f7fd935dec1abc39e0839360149b3c19655fa4..c734f0162304c4e14aabe23cbc0bab482de7f466 100644 (file)
--- a/include/llvm/IR/Metadata.h
+++ b/include/llvm/IR/Metadata.h
@@ -208,8 +208,9 @@ class NamedMDNode : public ilist_node<NamedMDNode> {
 
   explicit NamedMDNode(const Twine &N);
 
-  template<class T>
-  class op_iterator_impl {
+  template<class T1, class T2>
+  class op_iterator_impl :
+      public std::iterator<std::bidirectional_iterator_tag, T2> {
     const NamedMDNode *Node;
     unsigned Idx;
     op_iterator_impl(const NamedMDNode *N, unsigned i) : Node(N), Idx(i) { }
@@ -217,24 +218,30 @@ class NamedMDNode : public ilist_node<NamedMDNode> {
     friend class NamedMDNode;
 
   public:
-    op_iterator_impl() : Node(0), Idx(0) { }
-    op_iterator_impl(const op_iterator_impl &o) : Node(o.Node), Idx(o.Idx) { }
+    op_iterator_impl() : Node(nullptr), Idx(0) { }
 
-    bool operator==(const op_iterator_impl<T> &o) const { return Idx == o.Idx; }
-    bool operator!=(const op_iterator_impl<T> &o) const { return Idx != o.Idx; }
+    bool operator==(const op_iterator_impl &o) const { return Idx == o.Idx; }
+    bool operator!=(const op_iterator_impl &o) const { return Idx != o.Idx; }
     op_iterator_impl &operator++() {
-      ++Idx; return *this;
+      ++Idx;
+      return *this;
     }
     op_iterator_impl operator++(int) {
       op_iterator_impl tmp(*this);
       operator++();
       return tmp;
     }
-    op_iterator_impl &operator=(const op_iterator_impl &o) {
-      Idx = o.Idx;
+    op_iterator_impl &operator--() {
+      --Idx;
       return *this;
     }
-    T operator*() const { return Node->getOperand(Idx); }
+    op_iterator_impl operator--(int) {
+      op_iterator_impl tmp(*this);
+      operator--();
+      return tmp;
+    }
+
+    T1 operator*() const { return Node->getOperand(Idx); }
   };
 
 public:
@@ -265,7 +272,7 @@ public:
   StringRef getName() const;
 
   /// print - Implement operator<< on NamedMDNode.
-  void print(raw_ostream &ROS, AssemblyAnnotationWriter *AAW = 0) const;
+  void print(raw_ostream &ROS, AssemblyAnnotationWriter *AAW = nullptr) const;
 
   /// dump() - Allow printing of NamedMDNodes from the debugger.
   void dump() const;
@@ -273,11 +280,11 @@ public:
   // ---------------------------------------------------------------------------
   // Operand Iterator interface...
   //
-  typedef op_iterator_impl<MDNode*> op_iterator;
+  typedef op_iterator_impl<MDNode*, MDNode> op_iterator;
   op_iterator op_begin() { return op_iterator(this, 0); }
   op_iterator op_end()   { return op_iterator(this, getNumOperands()); }
 
-  typedef op_iterator_impl<const MDNode*> const_op_iterator;
+  typedef op_iterator_impl<const MDNode*, MDNode> const_op_iterator;
   const_op_iterator op_begin() const { return const_op_iterator(this, 0); }
   const_op_iterator op_end()   const { return const_op_iterator(this, getNumOperands()); }