RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-14 07:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Treat BBs that use BBs as proper predecessors and successors in the CFG.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47989 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2008-03-06 06:54:53 +00:00
parent 64df3bc625
commit cd943e4317
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/llvm/Support/CFG.h
View File

@ -34,14 +34,14 @@ public:
typedef PredIterator<_Ptr,_USE_iterator> _Self; typedef PredIterator<_Ptr,_USE_iterator> _Self;
typedef typename super::pointer pointer; typedef typename super::pointer pointer;
inline void advancePastNonTerminators() { inline void advancePastNonPreds() {
// Loop to ignore non terminator uses (for example PHI nodes)... // Loop to ignore non predecessor uses (for example PHI nodes)...
while (!It.atEnd() && !isa<TerminatorInst>(*It)) while (!It.atEnd() && !isa<TerminatorInst>(*It) && !isa<BasicBlock>(*It))
++It; ++It;
} }
inline PredIterator(_Ptr *bb) : It(bb->use_begin()) { inline PredIterator(_Ptr *bb) : It(bb->use_begin()) {
advancePastNonTerminators(); advancePastNonPreds();
} }
inline PredIterator(_Ptr *bb, bool) : It(bb->use_end()) {} inline PredIterator(_Ptr *bb, bool) : It(bb->use_end()) {}
@ -50,13 +50,16 @@ public:
inline pointer operator*() const { inline pointer operator*() const {
assert(!It.atEnd() && "pred_iterator out of range!"); assert(!It.atEnd() && "pred_iterator out of range!");
return cast<TerminatorInst>(*It)->getParent(); if (isa<TerminatorInst>(*It)) // not dyn_cast due to const-correctness
return cast<TerminatorInst>(*It)->getParent();
return cast<_Ptr>(*It);
} }
inline pointer *operator->() const { return &(operator*()); } inline pointer *operator->() const { return &(operator*()); }
inline _Self& operator++() { // Preincrement inline _Self& operator++() { // Preincrement
assert(!It.atEnd() && "pred_iterator out of range!"); assert(!It.atEnd() && "pred_iterator out of range!");
++It; advancePastNonTerminators(); ++It; advancePastNonPreds();
return *this; return *this;
} }
@ -100,6 +103,8 @@ public:
inline SuccIterator(Term_ T, bool) // end iterator inline SuccIterator(Term_ T, bool) // end iterator
: Term(T), idx(Term->getNumSuccessors()) { : Term(T), idx(Term->getNumSuccessors()) {
assert(T && "getTerminator returned null!"); assert(T && "getTerminator returned null!");
if (Term->getParent()->getUnwindDest())
++idx;
} }
inline const _Self &operator=(const _Self &I) { inline const _Self &operator=(const _Self &I) {
@ -115,7 +120,12 @@ public:
inline bool operator==(const _Self& x) const { return idx == x.idx; } inline bool operator==(const _Self& x) const { return idx == x.idx; }
inline bool operator!=(const _Self& x) const { return !operator==(x); } inline bool operator!=(const _Self& x) const { return !operator==(x); }
inline pointer operator*() const { return Term->getSuccessor(idx); } inline pointer operator*() const {
if (idx == Term->getNumSuccessors())
return Term->getParent()->getUnwindDest();
return Term->getSuccessor(idx);
}
inline pointer operator->() const { return operator*(); } inline pointer operator->() const { return operator*(); }
inline _Self& operator++() { ++idx; return *this; } // Preincrement inline _Self& operator++() { ++idx; return *this; } // Preincrement