[llvm-commits] [llvm] r66415 - in /llvm/trunk/include/llvm: ADT/ilist_node.h BasicBlock.h CodeGen/MachineBasicBlock.h CodeGen/MachineFunction.h CodeGen/SelectionDAG.h Function.h

[Bill Wendling]

Hi Gabor,

This is causing internal compiler errors in the llvm-gcc bootstrap
build. I reverted this. Could you take a look please?

-bw

On Sun, Mar 8, 2009 at 11:09 PM, Gabor Greif <ggreif at gmail.com> wrote:
> Author: ggreif
> Date: Mon Mar  9 02:09:01 2009
> New Revision: 66415
>
> URL: http://llvm.org/viewvc/llvm-project?rev=66415&view=rev
> Log:
> in builds without asserts we do not need to allocate the Next pointer in "ghostly" sentinels
>
> Modified:
>    llvm/trunk/include/llvm/ADT/ilist_node.h
>    llvm/trunk/include/llvm/BasicBlock.h
>    llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
>    llvm/trunk/include/llvm/CodeGen/MachineFunction.h
>    llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
>    llvm/trunk/include/llvm/Function.h
>
> Modified: llvm/trunk/include/llvm/ADT/ilist_node.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ilist_node.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/ilist_node.h (original)
> +++ llvm/trunk/include/llvm/ADT/ilist_node.h Mon Mar  9 02:09:01 2009
> @@ -18,30 +18,49 @@
>  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 trais class.
> +#ifndef NDEBUG
> +#   define ILIST_NODE ilist_node
> +#else
> +#   define ILIST_NODE ilist_half_node
> +#endif
> +
>  } // End llvm namespace
>
>  #endif
>
> Modified: llvm/trunk/include/llvm/BasicBlock.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BasicBlock.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/BasicBlock.h (original)
> +++ llvm/trunk/include/llvm/BasicBlock.h Mon Mar  9 02:09:01 2009
> @@ -46,7 +46,7 @@
>   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
>
> Modified: llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h Mon Mar  9 02:09:01 2009
> @@ -26,7 +26,7 @@
>  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;
>
> Modified: llvm/trunk/include/llvm/CodeGen/MachineFunction.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineFunction.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Mon Mar  9 02:09:01 2009
> @@ -37,7 +37,7 @@
>  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);
>
> Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Mon Mar  9 02:09:01 2009
> @@ -39,7 +39,7 @@
>
>  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);
>
> Modified: llvm/trunk/include/llvm/Function.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=66415&r1=66414&r2=66415&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Function.h (original)
> +++ llvm/trunk/include/llvm/Function.h Mon Mar  9 02:09:01 2009
> @@ -45,7 +45,7 @@
>
>   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 @@
>
>   static ValueSymbolTable *getSymTab(Function *ItemParent);
>  private:
> -  mutable ilist_node<Argument> Sentinel;
> +  mutable ILIST_NODE<Argument> Sentinel;
>  };
>
>  class Function : public GlobalValue, public Annotable,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>