diff options
author | Gabor Greif <ggreif@gmail.com> | 2009-08-25 21:25:22 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2009-08-25 21:25:22 +0000 |
commit | 2600ca8b3f3602d0904289eeed3d26f3d7aad2ae (patch) | |
tree | 9d0789506d76005f253ca4003a85d2537aa6d88e /include/llvm/ADT/ilist_node.h | |
parent | 0adcd35f78b89bf70eb634b7f9ac2103516ca2b2 (diff) | |
download | llvm-2600ca8b3f3602d0904289eeed3d26f3d7aad2ae.tar.gz llvm-2600ca8b3f3602d0904289eeed3d26f3d7aad2ae.tar.bz2 llvm-2600ca8b3f3602d0904289eeed3d26f3d7aad2ae.tar.xz |
re-committing yesterday's r79938.
This time there is no additional include of llvm/Config/config.h
at all. Instead I use a hard-coded preprecessor symbol:
LLVM_COMPACTIFY_SENTINELS
(should this work on the self-hosting buildbot, then
cleanups come next)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80035 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/ADT/ilist_node.h')
-rw-r--r-- | include/llvm/ADT/ilist_node.h | 48 |
1 files changed, 39 insertions, 9 deletions
diff --git a/include/llvm/ADT/ilist_node.h b/include/llvm/ADT/ilist_node.h index dae7475ffa..ae4a5905f8 100644 --- a/include/llvm/ADT/ilist_node.h +++ b/include/llvm/ADT/ilist_node.h @@ -15,33 +15,63 @@ #ifndef LLVM_ADT_ILIST_NODE_H #define LLVM_ADT_ILIST_NODE_H +#undef LLVM_COMPACTIFY_SENTINELS +/// @brief activate small sentinel structs +/// Comment out if you want better debuggability +/// of ilist<> end() iterators. +/// See also llvm/ADT/ilist.h, where the +/// same change must be made. +/// +#define LLVM_COMPACTIFY_SENTINELS 1 + namespace llvm { template<typename NodeTy> -struct ilist_nextprev_traits; +struct ilist_traits; +/// ilist_half_node - Base class that provides prev services for sentinels. +/// template<typename NodeTy> -struct ilist_traits; +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> +struct ilist_nextprev_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 { -private: +class ilist_node : ilist_half_node<NodeTy> { friend struct ilist_nextprev_traits<NodeTy>; friend struct ilist_traits<NodeTy>; - NodeTy *Prev, *Next; - NodeTy *getPrev() { return Prev; } + NodeTy *Next; 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() : Prev(0), Next(0) {} + ilist_node() : 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 traits class. The LLVM_COMPACTIFY_SENTINELS +/// preprocessor symbol controls this. +/// +#if defined(LLVM_COMPACTIFY_SENTINELS) && LLVM_COMPACTIFY_SENTINELS +# define ILIST_NODE ilist_half_node +#else +# define ILIST_NODE ilist_node +#endif + } // End llvm namespace #endif |