(& some unnecessary 'inline' keywords, too)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232303
91177308-0d34-0410-b5e6-
96231b3b80d8
const_inst_iterator InstI; // Method instruction iterator
unsigned OpIdx; // Operand index
const_inst_iterator InstI; // Method instruction iterator
unsigned OpIdx; // Operand index
- typedef constant_iterator _Self;
-
- inline bool isAtConstant() const {
+ bool isAtConstant() const {
assert(!InstI.atEnd() && OpIdx < InstI->getNumOperands() &&
"isAtConstant called with invalid arguments!");
return isa<Constant>(InstI->getOperand(OpIdx));
}
public:
assert(!InstI.atEnd() && OpIdx < InstI->getNumOperands() &&
"isAtConstant called with invalid arguments!");
return isa<Constant>(InstI->getOperand(OpIdx));
}
public:
- inline constant_iterator(const Function *F) : InstI(inst_begin(F)), OpIdx(0) {
+ constant_iterator(const Function *F) : InstI(inst_begin(F)), OpIdx(0) {
// Advance to first constant... if we are not already at constant or end
if (InstI != inst_end(F) && // InstI is valid?
(InstI->getNumOperands() == 0 || !isAtConstant())) // Not at constant?
operator++();
}
// Advance to first constant... if we are not already at constant or end
if (InstI != inst_end(F) && // InstI is valid?
(InstI->getNumOperands() == 0 || !isAtConstant())) // Not at constant?
operator++();
}
- inline constant_iterator(const Function *F, bool) // end ctor
- : InstI(inst_end(F)), OpIdx(0) {
- }
+ constant_iterator(const Function *F, bool) // end ctor
+ : InstI(inst_end(F)),
+ OpIdx(0) {}
- inline bool operator==(const _Self& x) const { return OpIdx == x.OpIdx &&
- InstI == x.InstI; }
- inline bool operator!=(const _Self& x) const { return !operator==(x); }
+ bool operator==(const constant_iterator &x) const {
+ return OpIdx == x.OpIdx && InstI == x.InstI;
+ }
+ bool operator!=(const constant_iterator &x) const { return !(*this == x); }
- inline pointer operator*() const {
+ pointer operator*() const {
assert(isAtConstant() && "Dereferenced an iterator at the end!");
return cast<Constant>(InstI->getOperand(OpIdx));
}
assert(isAtConstant() && "Dereferenced an iterator at the end!");
return cast<Constant>(InstI->getOperand(OpIdx));
}
- inline pointer operator->() const { return operator*(); }
+ pointer operator->() const { return **this; }
- inline _Self& operator++() { // Preincrement implementation
+ constant_iterator &operator++() { // Preincrement implementation
++OpIdx;
do {
unsigned NumOperands = InstI->getNumOperands();
++OpIdx;
do {
unsigned NumOperands = InstI->getNumOperands();
return *this; // At the end of the method
}
return *this; // At the end of the method
}
- inline _Self operator++(int) { // Postincrement
- _Self tmp = *this; ++*this; return tmp;
+ onstant_iterator operator++(int) { // Postincrement
+ constant_iterator tmp = *this;
+ ++*this;
+ return tmp;
- inline bool atEnd() const { return InstI.atEnd(); }
+ bool atEnd() const { return InstI.atEnd(); }
};
inline constant_iterator constant_begin(const Function *F) {
};
inline constant_iterator constant_begin(const Function *F) {