[llvm-commits] [llvm] r66331 - in /llvm/trunk/include/llvm: BasicBlock.h Function.h Module.h SymbolTableListTraits.h
Gabor Greif
ggreif at gmail.com
Sat Mar 7 02:00:39 PST 2009
Author: ggreif
Date: Sat Mar 7 04:00:35 2009
New Revision: 66331
URL: http://llvm.org/viewvc/llvm-project?rev=66331&view=rev
Log:
Remove the burden of dealing with list offsets
from SymbolTableListTraits' clients, and
intead request a nice declarative interface.
Cleans up an IMHO ugly wart.
Modified:
llvm/trunk/include/llvm/BasicBlock.h
llvm/trunk/include/llvm/Function.h
llvm/trunk/include/llvm/Module.h
llvm/trunk/include/llvm/SymbolTableListTraits.h
Modified: llvm/trunk/include/llvm/BasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BasicBlock.h?rev=66331&r1=66330&r2=66331&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BasicBlock.h (original)
+++ llvm/trunk/include/llvm/BasicBlock.h Sat Mar 7 04:00:35 2009
@@ -48,7 +48,6 @@
static iplist<Instruction> &getList(BasicBlock *BB);
static ValueSymbolTable *getSymTab(BasicBlock *ItemParent);
- static int getListOffset();
private:
mutable ilist_node<Instruction> Sentinel;
};
@@ -186,6 +185,9 @@
///
const InstListType &getInstList() const { return InstList; }
InstListType &getInstList() { return InstList; }
+ static iplist<Instruction> BasicBlock::*getSublistAccess(Instruction*) {
+ return &BasicBlock::InstList;
+ }
/// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const BasicBlock *) { return true; }
@@ -224,19 +226,8 @@
/// the basic block).
///
BasicBlock *splitBasicBlock(iterator I, const std::string &BBName = "");
-
-
- static unsigned getInstListOffset() {
- BasicBlock *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->InstList));
- }
};
-inline int
-ilist_traits<Instruction>::getListOffset() {
- return BasicBlock::getInstListOffset();
-}
-
} // End llvm namespace
#endif
Modified: llvm/trunk/include/llvm/Function.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=66331&r1=66330&r2=66331&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Sat Mar 7 04:00:35 2009
@@ -45,7 +45,6 @@
static iplist<BasicBlock> &getList(Function *F);
static ValueSymbolTable *getSymTab(Function *ItemParent);
- static int getListOffset();
private:
mutable ilist_node<BasicBlock> Sentinel;
};
@@ -64,7 +63,6 @@
static iplist<Argument> &getList(Function *F);
static ValueSymbolTable *getSymTab(Function *ItemParent);
- static int getListOffset();
private:
mutable ilist_node<Argument> Sentinel;
};
@@ -305,9 +303,15 @@
CheckLazyArguments();
return ArgumentList;
}
+ static iplist<Argument> Function::*getSublistAccess(Argument*) {
+ return &Function::ArgumentList;
+ }
const BasicBlockListType &getBasicBlockList() const { return BasicBlocks; }
BasicBlockListType &getBasicBlockList() { return BasicBlocks; }
+ static iplist<BasicBlock> Function::*getSublistAccess(BasicBlock*) {
+ return &Function::BasicBlocks;
+ }
const BasicBlock &getEntryBlock() const { return front(); }
BasicBlock &getEntryBlock() { return front(); }
@@ -393,15 +397,6 @@
/// including any contained basic blocks.
///
void dropAllReferences();
-
- static unsigned getBasicBlockListOffset() {
- Function *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->BasicBlocks));
- }
- static unsigned getArgumentListOffset() {
- Function *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->ArgumentList));
- }
};
inline ValueSymbolTable *
@@ -414,17 +409,6 @@
return F ? &F->getValueSymbolTable() : 0;
}
-inline int
-ilist_traits<BasicBlock>::getListOffset() {
- return Function::getBasicBlockListOffset();
-}
-
-inline int
-ilist_traits<Argument>::getListOffset() {
- return Function::getArgumentListOffset();
-}
-
-
} // End llvm namespace
#endif
Modified: llvm/trunk/include/llvm/Module.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Module.h?rev=66331&r1=66330&r2=66331&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Module.h (original)
+++ llvm/trunk/include/llvm/Module.h Sat Mar 7 04:00:35 2009
@@ -33,7 +33,6 @@
static void destroySentinel(Function *F) { delete F; }
static iplist<Function> &getList(Module *M);
static inline ValueSymbolTable *getSymTab(Module *M);
- static int getListOffset();
};
template<> struct ilist_traits<GlobalVariable>
: public SymbolTableListTraits<GlobalVariable, Module> {
@@ -42,7 +41,6 @@
static void destroySentinel(GlobalVariable *GV) { delete GV; }
static iplist<GlobalVariable> &getList(Module *M);
static inline ValueSymbolTable *getSymTab(Module *M);
- static int getListOffset();
};
template<> struct ilist_traits<GlobalAlias>
: public SymbolTableListTraits<GlobalAlias, Module> {
@@ -51,7 +49,6 @@
static void destroySentinel(GlobalAlias *GA) { delete GA; }
static iplist<GlobalAlias> &getList(Module *M);
static inline ValueSymbolTable *getSymTab(Module *M);
- static int getListOffset();
};
/// A Module instance is used to store all the information related to an
@@ -294,14 +291,23 @@
const GlobalListType &getGlobalList() const { return GlobalList; }
/// Get the Module's list of global variables.
GlobalListType &getGlobalList() { return GlobalList; }
+ static iplist<GlobalVariable> Module::*getSublistAccess(GlobalVariable*) {
+ return &Module::GlobalList;
+ }
/// Get the Module's list of functions (constant).
const FunctionListType &getFunctionList() const { return FunctionList; }
/// Get the Module's list of functions.
FunctionListType &getFunctionList() { return FunctionList; }
+ static iplist<Function> Module::*getSublistAccess(Function*) {
+ return &Module::FunctionList;
+ }
/// Get the Module's list of aliases (constant).
const AliasListType &getAliasList() const { return AliasList; }
/// Get the Module's list of aliases.
AliasListType &getAliasList() { return AliasList; }
+ static iplist<GlobalAlias> Module::*getSublistAccess(GlobalAlias*) {
+ return &Module::AliasList;
+ }
/// Get the symbol table of global variable and function identifiers
const ValueSymbolTable &getValueSymbolTable() const { return *ValSymTab; }
/// Get the Module's symbol table of global variable and function identifiers.
@@ -395,19 +401,6 @@
/// that has "dropped all references", except operator delete.
void dropAllReferences();
/// @}
-
- static unsigned getFunctionListOffset() {
- Module *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->FunctionList));
- }
- static unsigned getGlobalVariableListOffset() {
- Module *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->GlobalList));
- }
- static unsigned getAliasListOffset() {
- Module *Obj = 0;
- return unsigned(reinterpret_cast<uintptr_t>(&Obj->AliasList));
- }
};
/// An iostream inserter for modules.
@@ -436,21 +429,6 @@
return M ? &M->getValueSymbolTable() : 0;
}
-inline int
-ilist_traits<Function>::getListOffset() {
- return Module::getFunctionListOffset();
-}
-
-inline int
-ilist_traits<GlobalVariable>::getListOffset() {
- return Module::getGlobalVariableListOffset();
-}
-
-inline int
-ilist_traits<GlobalAlias>::getListOffset() {
- return Module::getAliasListOffset();
-}
-
} // End llvm namespace
#endif
Modified: llvm/trunk/include/llvm/SymbolTableListTraits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/SymbolTableListTraits.h?rev=66331&r1=66330&r2=66331&view=diff
==============================================================================
--- llvm/trunk/include/llvm/SymbolTableListTraits.h (original)
+++ llvm/trunk/include/llvm/SymbolTableListTraits.h Sat Mar 7 04:00:35 2009
@@ -45,8 +45,13 @@
/// getListOwner - Return the object that owns this list. If this is a list
/// of instructions, it returns the BasicBlock that owns them.
ItemParentClass *getListOwner() {
- return reinterpret_cast<ItemParentClass*>(reinterpret_cast<char*>(this)-
- TraitsClass::getListOffset());
+ typedef iplist<ValueSubClass> ItemParentClass::*Sublist;
+ Sublist Sub(ItemParentClass::
+ getSublistAccess(static_cast<ValueSubClass*>(0)));
+ size_t Offset(size_t(&((ItemParentClass*)0->*Sub)));
+ iplist<ValueSubClass>* Anchor(static_cast<iplist<ValueSubClass>*>(this));
+ return reinterpret_cast<ItemParentClass*>(reinterpret_cast<char*>(Anchor)-
+ Offset);
}
void addNodeToList(ValueSubClass *V);
More information about the llvm-commits
mailing list