6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-08 03:30:22 +00:00
Code Issues Projects Releases Wiki Activity

SCC: Provide operator->() through iterator_facade_base

Browse Source 
Use the fancy new `iterator_facade_base` to add
`scc_iterator::operator->()`.  Remove other definitions where
`iterator_facade_base` does the right thing.

<rdar://problem/14292693>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207257 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith 2014-04-25 18:43:41 +00:00
parent 4870dae19f
commit eae0809a60
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/llvm/ADT/SCCIterator.h
View File

@ -25,6 +25,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/GraphTraits.h"
#include "llvm/ADT/iterator.h"
#include <vector>
namespace llvm {
@ -36,18 +37,14 @@ namespace llvm {
/// build up a vector of nodes in a particular SCC. Note that it is a forward
/// iterator and thus you cannot backtrack or re-visit nodes.
template <class GraphT, class GT = GraphTraits<GraphT>>
class scc_iterator
: public std::iterator<std::forward_iterator_tag,
const std::vector<typename GT::NodeType>,
ptrdiff_t> {
class scc_iterator : public iterator_facade_base<
scc_iterator<GraphT, GT>, std::forward_iterator_tag,
const std::vector<typename GT::NodeType>, ptrdiff_t> {
typedef typename GT::NodeType NodeType;
typedef typename GT::ChildIteratorType ChildItTy;
typedef std::vector<NodeType *> SccTy;
typedef std::iterator<std::forward_iterator_tag,
const std::vector<typename GT::NodeType>,
ptrdiff_t> super;
typedef typename super::reference reference;
typedef typename super::pointer pointer;
typedef typename scc_iterator::reference reference;
typedef typename scc_iterator::pointer pointer;
/// Element of VisitStack during DFS.
struct StackElement {
@ -115,17 +112,11 @@ public:
bool operator==(const scc_iterator &x) const {
return VisitStack == x.VisitStack && CurrentSCC == x.CurrentSCC;
}
bool operator!=(const scc_iterator &x) const { return !operator==(x); }
scc_iterator &operator++() {
GetNextSCC();
return *this;
}
scc_iterator operator++(int) {
scc_iterator tmp = *this;
++*this;
return tmp;
}
const SccTy &operator*() const {
assert(!CurrentSCC.empty() && "Dereferencing END SCC iterator!");