Revert r67844. This fixes the llvm-gcc-4.2 build on Darwin.
llvm-svn: 67856
This commit is contained in:
parent
15833b93cf
commit
8680802b1f
|
@ -17,50 +17,31 @@
|
||||||
|
|
||||||
namespace llvm {
|
namespace llvm {
|
||||||
|
|
||||||
template<typename NodeTy>
|
|
||||||
struct ilist_traits;
|
|
||||||
|
|
||||||
/// ilist_half_node - Base class that provides prev services for sentinels.
|
|
||||||
///
|
|
||||||
template<typename NodeTy>
|
|
||||||
class ilist_half_node {
|
|
||||||
friend struct ilist_traits<NodeTy>;
|
|
||||||
NodeTy *Prev;
|
|
||||||
protected:
|
|
||||||
NodeTy *getPrev() { return Prev; }
|
|
||||||
const NodeTy *getPrev() const { return Prev; }
|
|
||||||
void setPrev(NodeTy *P) { Prev = P; }
|
|
||||||
ilist_half_node() : Prev(0) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename NodeTy>
|
template<typename NodeTy>
|
||||||
struct ilist_nextprev_traits;
|
struct ilist_nextprev_traits;
|
||||||
|
|
||||||
|
template<typename NodeTy>
|
||||||
|
struct ilist_traits;
|
||||||
|
|
||||||
/// ilist_node - Base class that provides next/prev services for nodes
|
/// ilist_node - Base class that provides next/prev services for nodes
|
||||||
/// that use ilist_nextprev_traits or ilist_default_traits.
|
/// that use ilist_nextprev_traits or ilist_default_traits.
|
||||||
///
|
///
|
||||||
template<typename NodeTy>
|
template<typename NodeTy>
|
||||||
class ilist_node : ilist_half_node<NodeTy> {
|
class ilist_node {
|
||||||
|
private:
|
||||||
friend struct ilist_nextprev_traits<NodeTy>;
|
friend struct ilist_nextprev_traits<NodeTy>;
|
||||||
friend struct ilist_traits<NodeTy>;
|
friend struct ilist_traits<NodeTy>;
|
||||||
NodeTy *Next;
|
NodeTy *Prev, *Next;
|
||||||
|
NodeTy *getPrev() { return Prev; }
|
||||||
NodeTy *getNext() { return Next; }
|
NodeTy *getNext() { return Next; }
|
||||||
|
const NodeTy *getPrev() const { return Prev; }
|
||||||
const NodeTy *getNext() const { return Next; }
|
const NodeTy *getNext() const { return Next; }
|
||||||
|
void setPrev(NodeTy *N) { Prev = N; }
|
||||||
void setNext(NodeTy *N) { Next = N; }
|
void setNext(NodeTy *N) { Next = N; }
|
||||||
protected:
|
protected:
|
||||||
ilist_node() : Next(0) {}
|
ilist_node() : Prev(0), Next(0) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
/// When assertions are off, the Next field of sentinels
|
|
||||||
/// will not be accessed. So it is not necessary to allocate
|
|
||||||
/// space for it. The following macro selects the most
|
|
||||||
/// efficient trais class.
|
|
||||||
#ifndef NDEBUG
|
|
||||||
# define ILIST_NODE ilist_node
|
|
||||||
#else
|
|
||||||
# define ILIST_NODE ilist_half_node
|
|
||||||
#endif
|
|
||||||
|
|
||||||
} // End llvm namespace
|
} // End llvm namespace
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,7 +46,7 @@ template<> struct ilist_traits<Instruction>
|
||||||
Instruction *ensureHead(Instruction*) const { return createSentinel(); }
|
Instruction *ensureHead(Instruction*) const { return createSentinel(); }
|
||||||
static void noteHead(Instruction*, Instruction*) {}
|
static void noteHead(Instruction*, Instruction*) {}
|
||||||
private:
|
private:
|
||||||
mutable ILIST_NODE<Instruction> Sentinel;
|
mutable ilist_node<Instruction> Sentinel;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// This represents a single basic block in LLVM. A basic block is simply a
|
/// This represents a single basic block in LLVM. A basic block is simply a
|
||||||
|
|
|
@ -26,7 +26,7 @@ class MachineFunction;
|
||||||
template <>
|
template <>
|
||||||
struct ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> {
|
struct ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> {
|
||||||
private:
|
private:
|
||||||
mutable ILIST_NODE<MachineInstr> Sentinel;
|
mutable ilist_node<MachineInstr> Sentinel;
|
||||||
|
|
||||||
// this is only set by the MachineBasicBlock owning the LiveList
|
// this is only set by the MachineBasicBlock owning the LiveList
|
||||||
friend class MachineBasicBlock;
|
friend class MachineBasicBlock;
|
||||||
|
|
|
@ -37,7 +37,7 @@ class TargetMachine;
|
||||||
template <>
|
template <>
|
||||||
struct ilist_traits<MachineBasicBlock>
|
struct ilist_traits<MachineBasicBlock>
|
||||||
: public ilist_default_traits<MachineBasicBlock> {
|
: public ilist_default_traits<MachineBasicBlock> {
|
||||||
mutable ILIST_NODE<MachineBasicBlock> Sentinel;
|
mutable ilist_node<MachineBasicBlock> Sentinel;
|
||||||
public:
|
public:
|
||||||
MachineBasicBlock *createSentinel() const {
|
MachineBasicBlock *createSentinel() const {
|
||||||
return static_cast<MachineBasicBlock*>(&Sentinel);
|
return static_cast<MachineBasicBlock*>(&Sentinel);
|
||||||
|
|
|
@ -39,7 +39,7 @@ class FunctionLoweringInfo;
|
||||||
|
|
||||||
template<> struct ilist_traits<SDNode> : public ilist_default_traits<SDNode> {
|
template<> struct ilist_traits<SDNode> : public ilist_default_traits<SDNode> {
|
||||||
private:
|
private:
|
||||||
mutable ILIST_NODE<SDNode> Sentinel;
|
mutable ilist_node<SDNode> Sentinel;
|
||||||
public:
|
public:
|
||||||
SDNode *createSentinel() const {
|
SDNode *createSentinel() const {
|
||||||
return static_cast<SDNode*>(&Sentinel);
|
return static_cast<SDNode*>(&Sentinel);
|
||||||
|
|
|
@ -45,7 +45,7 @@ template<> struct ilist_traits<BasicBlock>
|
||||||
|
|
||||||
static ValueSymbolTable *getSymTab(Function *ItemParent);
|
static ValueSymbolTable *getSymTab(Function *ItemParent);
|
||||||
private:
|
private:
|
||||||
mutable ILIST_NODE<BasicBlock> Sentinel;
|
mutable ilist_node<BasicBlock> Sentinel;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<> struct ilist_traits<Argument>
|
template<> struct ilist_traits<Argument>
|
||||||
|
@ -62,7 +62,7 @@ template<> struct ilist_traits<Argument>
|
||||||
|
|
||||||
static ValueSymbolTable *getSymTab(Function *ItemParent);
|
static ValueSymbolTable *getSymTab(Function *ItemParent);
|
||||||
private:
|
private:
|
||||||
mutable ILIST_NODE<Argument> Sentinel;
|
mutable ilist_node<Argument> Sentinel;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Function : public GlobalValue, public Annotable,
|
class Function : public GlobalValue, public Annotable,
|
||||||
|
|
Loading…
Reference in New Issue