maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix issues in the NamedMDNode operand iterator, including those pointed out by 

Chandler in review.

llvm-svn: 203058
This commit is contained in:
Owen Anderson 2014-03-06 01:51:01 +00:00
parent c3d9e9e55f
commit cab4afd7c6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/include/llvm/IR/Metadata.h
View File

@ -208,8 +208,9 @@ class NamedMDNode : public ilist_node<NamedMDNode> {
explicit NamedMDNode(const Twine &N); explicit NamedMDNode(const Twine &N);
template<class T> template<class T1, class T2>
class op_iterator_impl { class op_iterator_impl :
public std::iterator<std::random_access_iterator_tag, T2> {
const NamedMDNode *Node; const NamedMDNode *Node;
unsigned Idx; unsigned Idx;
op_iterator_impl(const NamedMDNode *N, unsigned i) : Node(N), Idx(i) { } op_iterator_impl(const NamedMDNode *N, unsigned i) : Node(N), Idx(i) { }
@ -220,10 +221,11 @@ class NamedMDNode : public ilist_node<NamedMDNode> {
op_iterator_impl() : Node(0), Idx(0) { } op_iterator_impl() : Node(0), Idx(0) { }
op_iterator_impl(const op_iterator_impl &o) : Node(o.Node), Idx(o.Idx) { } op_iterator_impl(const op_iterator_impl &o) : Node(o.Node), 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<T> &o) const { return Idx != o.Idx; } bool operator!=(const op_iterator_impl &o) const { return Idx != o.Idx; }
op_iterator_impl &operator++() { op_iterator_impl &operator++() {
++Idx; return *this; ++Idx;
return *this;
} }
op_iterator_impl operator++(int) { op_iterator_impl operator++(int) {
op_iterator_impl tmp(*this); op_iterator_impl tmp(*this);
@ -231,10 +233,11 @@ class NamedMDNode : public ilist_node<NamedMDNode> {
return tmp; return tmp;
} }
op_iterator_impl &operator=(const op_iterator_impl &o) { op_iterator_impl &operator=(const op_iterator_impl &o) {
Node = o.Node;
Idx = o.Idx; Idx = o.Idx;
return *this; return *this;
} }
T operator*() const { return Node->getOperand(Idx); } T1 operator*() const { return Node->getOperand(Idx); }
}; };
public: public:
@ -273,11 +276,11 @@ public:
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Operand Iterator interface... // 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_begin() { return op_iterator(this, 0); }
op_iterator op_end() { return op_iterator(this, getNumOperands()); } 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_begin() const { return const_op_iterator(this, 0); }
const_op_iterator op_end() const { return const_op_iterator(this, getNumOperands()); } const_op_iterator op_end() const { return const_op_iterator(this, getNumOperands()); }