RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Remove all the LLVM_COMPACTIFY_SENTINELS-related macro magic as discussed with Chris on IRC. Anybody wanting to debug sentinel dereferencing problems must revert this patch and perform the indicated modifications.

Browse Source 
llvm-svn: 80128
This commit is contained in:
Gabor Greif 2009-08-26 19:16:32 +00:00
parent 9d68d0fbe2
commit 830005b778
7 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/llvm/ADT/ilist.h
View File

@ -41,21 +41,6 @@
#include "llvm/ADT/iterator.h"
#include <cassert>
#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_node.h, where the
/// same change must be made.
///
#define LLVM_COMPACTIFY_SENTINELS 1
#if defined(LLVM_COMPACTIFY_SENTINELS) && LLVM_COMPACTIFY_SENTINELS
# define sentinel_tail_assert(COND)
#else
# define sentinel_tail_assert(COND) assert(COND)
#endif
namespace llvm {
template<typename NodeTy, typename Traits> class iplist;
@ -204,12 +189,10 @@ public:
// Accessors...
operator pointer() const {
sentinel_tail_assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
return NodePtr;
}
reference operator*() const {
sentinel_tail_assert(Traits::getNext(NodePtr) != 0 && "Dereferencing end()!");
return *NodePtr;
}
pointer operator->() const { return &operator*(); }
@ -230,7 +213,6 @@ public:
}
ilist_iterator &operator++() { // preincrement - Advance
NodePtr = Traits::getNext(NodePtr);
sentinel_tail_assert(NodePtr && "++'d off the end of an ilist!");
return *this;
}
ilist_iterator operator--(int) { // postdecrement operators...

21
include/llvm/ADT/ilist_node.h
View File

@ -15,15 +15,6 @@
#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>
@ -60,18 +51,6 @@ protected:
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

2
include/llvm/BasicBlock.h
View File

@ -47,7 +47,7 @@ template<> struct ilist_traits<Instruction>
Instruction *ensureHead(Instruction*) const { return createSentinel(); }
static void noteHead(Instruction*, Instruction*) {}
private:
mutable ILIST_NODE<Instruction> Sentinel;
mutable ilist_half_node<Instruction> Sentinel;
};
/// This represents a single basic block in LLVM. A basic block is simply a

2
include/llvm/CodeGen/MachineBasicBlock.h
View File

@ -26,7 +26,7 @@ class raw_ostream;
template <>
struct ilist_traits<MachineInstr> : public ilist_default_traits<MachineInstr> {
private:
mutable ILIST_NODE<MachineInstr> Sentinel;
mutable ilist_half_node<MachineInstr> Sentinel;
// this is only set by the MachineBasicBlock owning the LiveList
friend class MachineBasicBlock;

2
include/llvm/CodeGen/MachineFunction.h
View File

@ -38,7 +38,7 @@ class TargetRegisterClass;
template <>
struct ilist_traits<MachineBasicBlock>
: public ilist_default_traits<MachineBasicBlock> {
mutable ILIST_NODE<MachineBasicBlock> Sentinel;
mutable ilist_half_node<MachineBasicBlock> Sentinel;
public:
MachineBasicBlock *createSentinel() const {
return static_cast<MachineBasicBlock*>(&Sentinel);

2
include/llvm/CodeGen/SelectionDAG.h
View File

@ -37,7 +37,7 @@ class FunctionLoweringInfo;
template<> struct ilist_traits<SDNode> : public ilist_default_traits<SDNode> {
private:
mutable ILIST_NODE<SDNode> Sentinel;
mutable ilist_half_node<SDNode> Sentinel;
public:
SDNode *createSentinel() const {
return static_cast<SDNode*>(&Sentinel);

4
include/llvm/Function.h
View File

@ -45,7 +45,7 @@ template<> struct ilist_traits<BasicBlock>
static ValueSymbolTable *getSymTab(Function *ItemParent);
private:
mutable ILIST_NODE<BasicBlock> Sentinel;
mutable ilist_half_node<BasicBlock> Sentinel;
};
template<> struct ilist_traits<Argument>
@ -62,7 +62,7 @@ template<> struct ilist_traits<Argument>
static ValueSymbolTable *getSymTab(Function *ItemParent);
private:
mutable ILIST_NODE<Argument> Sentinel;
mutable ilist_half_node<Argument> Sentinel;
};
class Function : public GlobalValue,