diff options
author | Dan Gohman <gohman@apple.com> | 2009-03-27 18:37:13 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2009-03-27 18:37:13 +0000 |
commit | 9c01f2dd0b20e09f4edef832620a188eda62ff5a (patch) | |
tree | c77dd696f7629cb1b194f92d691a871133e56b36 /include/llvm | |
parent | a6b37c09d3ce90b03c9d6ccbaf83068b9ad6f0ab (diff) | |
download | llvm-9c01f2dd0b20e09f4edef832620a188eda62ff5a.tar.gz llvm-9c01f2dd0b20e09f4edef832620a188eda62ff5a.tar.bz2 llvm-9c01f2dd0b20e09f4edef832620a188eda62ff5a.tar.xz |
Revert r67844. This fixes the llvm-gcc-4.2 build on Darwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67856 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
-rw-r--r-- | include/llvm/ADT/ilist_node.h | 37 | ||||
-rw-r--r-- | include/llvm/BasicBlock.h | 2 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineBasicBlock.h | 2 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineFunction.h | 2 | ||||
-rw-r--r-- | include/llvm/CodeGen/SelectionDAG.h | 2 | ||||
-rw-r--r-- | include/llvm/Function.h | 4 |
6 files changed, 15 insertions, 34 deletions
diff --git a/include/llvm/ADT/ilist_node.h b/include/llvm/ADT/ilist_node.h index 9c7e6f6a51..dae7475ffa 100644 --- a/include/llvm/ADT/ilist_node.h +++ b/include/llvm/ADT/ilist_node.h @@ -18,49 +18,30 @@ 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) {} -}; +struct ilist_nextprev_traits; template<typename NodeTy> -struct ilist_nextprev_traits; +struct ilist_traits; /// ilist_node - Base class that provides next/prev services for nodes /// that use ilist_nextprev_traits or ilist_default_traits. /// template<typename NodeTy> -class ilist_node : ilist_half_node<NodeTy> { +class ilist_node { +private: friend struct ilist_nextprev_traits<NodeTy>; friend struct ilist_traits<NodeTy>; - NodeTy *Next; + NodeTy *Prev, *Next; + NodeTy *getPrev() { return Prev; } NodeTy *getNext() { return Next; } + const NodeTy *getPrev() const { return Prev; } const NodeTy *getNext() const { return Next; } + void setPrev(NodeTy *N) { Prev = N; } void setNext(NodeTy *N) { Next = N; } 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 #endif diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h index d0bd25a0db..072f6152ea 100644 --- a/include/llvm/BasicBlock.h +++ b/include/llvm/BasicBlock.h @@ -46,7 +46,7 @@ template<> struct ilist_traits<Instruction> Instruction *ensureHead(Instruction*) const { return createSentinel(); } static void noteHead(Instruction*, Instruction*) {} 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 diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index c7a29c22b7..56b96ea872 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -26,7 +26,7 @@ class MachineFunction; template <> struct ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> { private: - mutable ILIST_NODE<MachineInstr> Sentinel; + mutable ilist_node<MachineInstr> Sentinel; // this is only set by the MachineBasicBlock owning the LiveList friend class MachineBasicBlock; diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h index e8a847d633..dc7fa8cb16 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -37,7 +37,7 @@ class TargetMachine; template <> struct ilist_traits<MachineBasicBlock> : public ilist_default_traits<MachineBasicBlock> { - mutable ILIST_NODE<MachineBasicBlock> Sentinel; + mutable ilist_node<MachineBasicBlock> Sentinel; public: MachineBasicBlock *createSentinel() const { return static_cast<MachineBasicBlock*>(&Sentinel); diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h index 6f67a559ae..c440caf27a 100644 --- a/include/llvm/CodeGen/SelectionDAG.h +++ b/include/llvm/CodeGen/SelectionDAG.h @@ -39,7 +39,7 @@ class FunctionLoweringInfo; template<> struct ilist_traits<SDNode> : public ilist_default_traits<SDNode> { private: - mutable ILIST_NODE<SDNode> Sentinel; + mutable ilist_node<SDNode> Sentinel; public: SDNode *createSentinel() const { return static_cast<SDNode*>(&Sentinel); diff --git a/include/llvm/Function.h b/include/llvm/Function.h index 47273439c1..ccc006cfcf 100644 --- a/include/llvm/Function.h +++ b/include/llvm/Function.h @@ -45,7 +45,7 @@ template<> struct ilist_traits<BasicBlock> static ValueSymbolTable *getSymTab(Function *ItemParent); private: - mutable ILIST_NODE<BasicBlock> Sentinel; + mutable ilist_node<BasicBlock> Sentinel; }; template<> struct ilist_traits<Argument> @@ -62,7 +62,7 @@ template<> struct ilist_traits<Argument> static ValueSymbolTable *getSymTab(Function *ItemParent); private: - mutable ILIST_NODE<Argument> Sentinel; + mutable ilist_node<Argument> Sentinel; }; class Function : public GlobalValue, public Annotable, |