1 files changed, 9 insertions, 32 deletions

diff --git a/include/llvm/ADT/ilist_node.h b/include/llvm/ADT/ilist_node.h
index 89e5b6ef48..dae7475ffa 100644
--- a/include/llvm/ADT/ilist_node.h
+++ b/include/llvm/ADT/ilist_node.h
@@ -15,56 +15,33 @@
 #ifndef LLVM_ADT_ILIST_NODE_H
 #define LLVM_ADT_ILIST_NODE_H
 
-#include "llvm/Config/config.h"
-
 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 traits class. The LLVM_COMPACT_SENTINELS
-/// configuration variable controls this.
-///
-#if defined(LLVM_COMPACT_SENTINELS) && LLVM_COMPACT_SENTINELS
-#   define ILIST_NODE ilist_half_node
-#else
-#   define ILIST_NODE ilist_node
-#endif
-
 } // End llvm namespace
 
 #endif