struct AssemblyAnnotationWriter;
class BinaryOperator;
-template<typename SC> struct ilist_traits;
-template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
- typename SubClass> class SymbolTableListTraits;
+template<typename ValueSubClass, typename ItemParentClass>
+ class SymbolTableListTraits;
class Instruction : public User {
void operator=(const Instruction &); // Do not implement
void setNext(Instruction *N) { Next = N; }
void setPrev(Instruction *N) { Prev = N; }
- friend class SymbolTableListTraits<Instruction, BasicBlock, Function,
- ilist_traits<Instruction> >;
+ friend class SymbolTableListTraits<Instruction, BasicBlock>;
void setParent(BasicBlock *P);
protected:
Instruction(const Type *Ty, unsigned iType, Use *Ops, unsigned NumOps,
inline const BasicBlock *getParent() const { return Parent; }
inline BasicBlock *getParent() { return Parent; }
- // getNext/Prev - Return the next or previous instruction in the list. The
- // last node in the list is a terminator instruction.
- Instruction *getNext() { return Next; }
- const Instruction *getNext() const { return Next; }
- Instruction *getPrev() { return Prev; }
- const Instruction *getPrev() const { return Prev; }
-
/// removeFromParent - This method unlinks 'this' from the containing basic
/// block, but does not delete it.
///
/// Subclass classification... getOpcode() returns a member of
/// one of the enums that is coming soon (down below)...
///
- unsigned getOpcode() const { return getValueType() - InstructionVal; }
+ unsigned getOpcode() const { return getValueID() - InstructionVal; }
const char *getOpcodeName() const {
return getOpcodeName(getOpcode());
}
/// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const Instruction *) { return true; }
static inline bool classof(const Value *V) {
- return V->getValueType() >= Value::InstructionVal;
+ return V->getValueID() >= Value::InstructionVal;
}
//----------------------------------------------------------------------
#define LAST_OTHER_INST(N) OtherOpsEnd = N+1
#include "llvm/Instruction.def"
};
+
+private:
+ // getNext/Prev - Return the next or previous instruction in the list. The
+ // last node in the list is a terminator instruction.
+ Instruction *getNext() { return Next; }
+ const Instruction *getNext() const { return Next; }
+ Instruction *getPrev() { return Prev; }
+ const Instruction *getPrev() const { return Prev; }
};
} // End llvm namespace