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

[Gabor Greif]

On 27 Mrz., 19:37, Dan Gohman <goh... at apple.com> wrote:
> Author: djg
> Date: Fri Mar 27 13:37:13 2009
> New Revision: 67856
>
> URL:http://llvm.org/viewvc/llvm-project?rev=67856&view=rev
> Log:
> Revert r67844. This fixes the llvm-gcc-4.2 build on Darwin.


Hi Dan,

as of r67872 this function cannot crash any more, could
you give this patch another try locally?

Thanks, and cheers,

    Gabor

>
> 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...
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/ADT/ilist_node.h (original)
> +++ llvm/trunk/include/llvm/ADT/ilist_node.h Fri Mar 27 13:37:13 2009
> @@ -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
>
> Modified: llvm/trunk/include/llvm/BasicBlock.h
> URL:http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BasicBloc...
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/BasicBlock.h (original)
> +++ llvm/trunk/include/llvm/BasicBlock.h Fri Mar 27 13:37:13 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/M...
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h Fri Mar 27 13:37:13 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/M...
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Fri Mar 27 13:37:13 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/S...
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Fri Mar 27 13:37:13 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....
>
> =========================================================================== ===
> --- llvm/trunk/include/llvm/Function.h (original)
> +++ llvm/trunk/include/llvm/Function.h Fri Mar 27 13:37:13 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-comm... at cs.uiuc.eduhttp://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits