[llvm-commits] [llvm] r79960 - in /llvm/trunk/include/llvm: ADT/ilist.h ADT/ilist_node.h BasicBlock.h CodeGen/MachineBasicBlock.h CodeGen/MachineFunction.h CodeGen/SelectionDAG.h Function.h
Bill Wendling
isanbard at gmail.com
Mon Aug 24 17:05:04 PDT 2009
Author: void
Date: Mon Aug 24 19:05:04 2009
New Revision: 79960
URL: http://llvm.org/viewvc/llvm-project?rev=79960&view=rev
Log:
--- Reverse-merging r79938 into '.':
U include/llvm/BasicBlock.h
U include/llvm/ADT/ilist_node.h
U include/llvm/ADT/ilist.h
U include/llvm/CodeGen/SelectionDAG.h
U include/llvm/CodeGen/MachineFunction.h
U include/llvm/CodeGen/MachineBasicBlock.h
U include/llvm/Function.h
Revert r79938. It was causing self-hosting build failures.
Modified:
llvm/trunk/include/llvm/ADT/ilist.h
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.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ilist.h?rev=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/ilist.h (original)
+++ llvm/trunk/include/llvm/ADT/ilist.h Mon Aug 24 19:05:04 2009
@@ -39,15 +39,8 @@
#define LLVM_ADT_ILIST_H
#include "llvm/ADT/iterator.h"
-#include "llvm/Config/config.h"
#include <cassert>
-#if defined(LLVM_COMPACT_SENTINELS) && LLVM_COMPACT_SENTINELS
-# define sentinel_tail_assert(COND)
-#else
-# define sentinel_tail_assert(COND) assert(COND)
-#endif
-
namespace llvm {
template<typename NodeTy, typename Traits> class iplist;
@@ -196,12 +189,12 @@
// Accessors...
operator pointer() const {
- sentinel_tail_assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
+ assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
return NodePtr;
}
reference operator*() const {
- sentinel_tail_assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
+ assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
return *NodePtr;
}
pointer operator->() const { return &operator*(); }
@@ -222,7 +215,7 @@
}
ilist_iterator &operator++() { // preincrement - Advance
NodePtr = Traits::getNext(NodePtr);
- sentinel_tail_assert(NodePtr && "++'d off the end of an ilist!");
+ assert(NodePtr && "++'d off the end of an ilist!");
return *this;
}
ilist_iterator operator--(int) { // postdecrement operators...
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=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/ilist_node.h (original)
+++ llvm/trunk/include/llvm/ADT/ilist_node.h Mon Aug 24 19:05:04 2009
@@ -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
Modified: llvm/trunk/include/llvm/BasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BasicBlock.h?rev=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BasicBlock.h (original)
+++ llvm/trunk/include/llvm/BasicBlock.h Mon Aug 24 19:05:04 2009
@@ -47,7 +47,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=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h Mon Aug 24 19:05:04 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=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Mon Aug 24 19:05:04 2009
@@ -38,7 +38,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=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Mon Aug 24 19:05:04 2009
@@ -37,7 +37,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=79960&r1=79959&r2=79960&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Mon Aug 24 19:05:04 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,
More information about the llvm-commits
mailing list