aboutsummaryrefslogtreecommitdiff
path: root/include/llvm
diff options
context:
space:
mode:
Diffstat (limited to 'include/llvm')
-rw-r--r--include/llvm/Argument.h8
-rw-r--r--include/llvm/BasicBlock.h10
-rw-r--r--include/llvm/Function.h18
-rw-r--r--include/llvm/GlobalVariable.h8
-rw-r--r--include/llvm/Instruction.h8
-rw-r--r--include/llvm/Module.h17
-rw-r--r--include/llvm/SymbolTableListTraits.h27
-rw-r--r--include/llvm/ValueSymbolTable.h19
8 files changed, 61 insertions, 54 deletions
diff --git a/include/llvm/Argument.h b/include/llvm/Argument.h
index ea735b546a..580b18249b 100644
--- a/include/llvm/Argument.h
+++ b/include/llvm/Argument.h
@@ -18,9 +18,8 @@
namespace llvm {
-template<typename SC> struct ilist_traits;
-template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
- typename SubClass> class SymbolTableListTraits;
+template<typename ValueSubClass, typename ItemParentClass>
+ class SymbolTableListTraits;
/// A class to represent an incoming formal argument to a Function. An argument
/// is a very simple Value. It is essentially a named (optional) type. When used
@@ -33,8 +32,7 @@ class Argument : public Value { // Defined in the Function.cpp file
Argument *Prev, *Next; // Next and Prev links for our intrusive linked list
void setNext(Argument *N) { Next = N; }
void setPrev(Argument *N) { Prev = N; }
- friend class SymbolTableListTraits<Argument, Function, Function,
- ilist_traits<Argument> >;
+ friend class SymbolTableListTraits<Argument, Function>;
void setParent(Function *parent);
public:
diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h
index d8cb538845..8cc450c127 100644
--- a/include/llvm/BasicBlock.h
+++ b/include/llvm/BasicBlock.h
@@ -25,11 +25,12 @@ template <class Term, class BB> class SuccIterator; // Successor Iterator
template <class Ptr, class USE_iterator> class PredIterator;
template<> struct ilist_traits<Instruction>
- : public SymbolTableListTraits<Instruction, BasicBlock, Function> {
+ : public SymbolTableListTraits<Instruction, BasicBlock> {
// createSentinel is used to create a node that marks the end of the list...
static Instruction *createSentinel();
static void destroySentinel(Instruction *I) { delete I; }
static iplist<Instruction> &getList(BasicBlock *BB);
+ static ValueSymbolTable *getSymTab(BasicBlock *ItemParent);
};
/// This represents a single basic block in LLVM. A basic block is simply a
@@ -52,11 +53,12 @@ public:
private :
InstListType InstList;
BasicBlock *Prev, *Next; // Next and Prev links for our intrusive linked list
+ Function *Parent;
void setParent(Function *parent);
void setNext(BasicBlock *N) { Next = N; }
void setPrev(BasicBlock *N) { Prev = N; }
- friend class SymbolTableListTraits<BasicBlock, Function, Function>;
+ friend class SymbolTableListTraits<BasicBlock, Function>;
BasicBlock(const BasicBlock &); // Do not implement
void operator=(const BasicBlock &); // Do not implement
@@ -76,8 +78,8 @@ public:
/// getParent - Return the enclosing method, or null if none
///
- const Function *getParent() const { return InstList.getParent(); }
- Function *getParent() { return InstList.getParent(); }
+ const Function *getParent() const { return Parent; }
+ Function *getParent() { return Parent; }
// getNext/Prev - Return the next or previous basic block in the list.
BasicBlock *getNext() { return Next; }
diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 90a8275bec..d42c8d8aa2 100644
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -30,21 +30,23 @@ class ParamAttrsList;
// Traits for intrusive list of instructions...
template<> struct ilist_traits<BasicBlock>
- : public SymbolTableListTraits<BasicBlock, Function, Function> {
+ : public SymbolTableListTraits<BasicBlock, Function> {
// createSentinel is used to create a node that marks the end of the list...
static BasicBlock *createSentinel();
static void destroySentinel(BasicBlock *BB) { delete BB; }
static iplist<BasicBlock> &getList(Function *F);
+ static ValueSymbolTable *getSymTab(Function *ItemParent);
};
template<> struct ilist_traits<Argument>
- : public SymbolTableListTraits<Argument, Function, Function> {
+ : public SymbolTableListTraits<Argument, Function> {
// createSentinel is used to create a node that marks the end of the list...
static Argument *createSentinel();
static void destroySentinel(Argument *A) { delete A; }
static iplist<Argument> &getList(Function *F);
+ static ValueSymbolTable *getSymTab(Function *ItemParent);
};
class Function : public GlobalValue, public Annotable {
@@ -67,7 +69,7 @@ private:
ParamAttrsList *ParamAttrs; ///< Parameter attributes
unsigned CallingConvention; ///< Calling convention to use
- friend class SymbolTableListTraits<Function, Module, Module>;
+ friend class SymbolTableListTraits<Function, Module>;
void setParent(Module *parent);
Function *Prev, *Next;
@@ -238,6 +240,16 @@ public:
void dropAllReferences();
};
+inline ValueSymbolTable *
+ilist_traits<BasicBlock>::getSymTab(Function *F) {
+ return F ? &F->getValueSymbolTable() : 0;
+}
+
+inline ValueSymbolTable *
+ilist_traits<Argument>::getSymTab(Function *F) {
+ return F ? &F->getValueSymbolTable() : 0;
+}
+
} // End llvm namespace
#endif
diff --git a/include/llvm/GlobalVariable.h b/include/llvm/GlobalVariable.h
index ba869b817b..bf638fb21a 100644
--- a/include/llvm/GlobalVariable.h
+++ b/include/llvm/GlobalVariable.h
@@ -27,13 +27,11 @@ namespace llvm {
class Module;
class Constant;
class PointerType;
-template<typename SC> struct ilist_traits;
-template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
- typename SubClass> class SymbolTableListTraits;
+template<typename ValueSubClass, typename ItemParentClass>
+ class SymbolTableListTraits;
class GlobalVariable : public GlobalValue {
- friend class SymbolTableListTraits<GlobalVariable, Module, Module,
- ilist_traits<GlobalVariable> >;
+ friend class SymbolTableListTraits<GlobalVariable, Module>;
void operator=(const GlobalVariable &); // Do not implement
GlobalVariable(const GlobalVariable &); // Do not implement
diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index ed0357f823..dbf41f179f 100644
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -22,9 +22,8 @@ namespace llvm {
struct AssemblyAnnotationWriter;
class BinaryOperator;
-template<typename SC> struct ilist_traits;
-template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
- typename SubClass> class SymbolTableListTraits;
+template<typename ValueSubClass, typename ItemParentClass>
+ class SymbolTableListTraits;
class Instruction : public User {
void operator=(const Instruction &); // Do not implement
@@ -36,8 +35,7 @@ class Instruction : public User {
void setNext(Instruction *N) { Next = N; }
void setPrev(Instruction *N) { Prev = N; }
- friend class SymbolTableListTraits<Instruction, BasicBlock, Function,
- ilist_traits<Instruction> >;
+ friend class SymbolTableListTraits<Instruction, BasicBlock>;
void setParent(BasicBlock *P);
protected:
Instruction(const Type *Ty, unsigned iType, Use *Ops, unsigned NumOps,
diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index 3d68e736bf..e645f51c1c 100644
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -26,18 +26,20 @@ class GlobalValueRefMap; // Used by ConstantVals.cpp
class FunctionType;
template<> struct ilist_traits<Function>
- : public SymbolTableListTraits<Function, Module, Module> {
+ : public SymbolTableListTraits<Function, Module> {
// createSentinel is used to create a node that marks the end of the list.
static Function *createSentinel();
static void destroySentinel(Function *F) { delete F; }
static iplist<Function> &getList(Module *M);
+ static inline ValueSymbolTable *getSymTab(Module *M);
};
template<> struct ilist_traits<GlobalVariable>
- : public SymbolTableListTraits<GlobalVariable, Module, Module> {
+ : public SymbolTableListTraits<GlobalVariable, Module> {
// createSentinel is used to create a node that marks the end of the list.
static GlobalVariable *createSentinel();
static void destroySentinel(GlobalVariable *GV) { delete GV; }
static iplist<GlobalVariable> &getList(Module *M);
+ static inline ValueSymbolTable *getSymTab(Module *M);
};
/// A Module instance is used to store all the information related to an
@@ -319,6 +321,17 @@ inline std::ostream &operator<<(std::ostream &O, const Module &M) {
return O;
}
+inline ValueSymbolTable *
+ilist_traits<Function>::getSymTab(Module *M) {
+ return M ? &M->getValueSymbolTable() : 0;
+}
+
+inline ValueSymbolTable *
+ilist_traits<GlobalVariable>::getSymTab(Module *M) {
+ return M ? &M->getValueSymbolTable() : 0;
+}
+
+
} // End llvm namespace
#endif
diff --git a/include/llvm/SymbolTableListTraits.h b/include/llvm/SymbolTableListTraits.h
index 969c03fc55..099cfe0ca7 100644
--- a/include/llvm/SymbolTableListTraits.h
+++ b/include/llvm/SymbolTableListTraits.h
@@ -31,24 +31,17 @@ template<typename NodeTy> class ilist_iterator;
template<typename NodeTy, typename Traits> class iplist;
template<typename Ty> struct ilist_traits;
-// ValueSubClass - The type of objects that I hold
-// ItemParentType - I call setParent() on all of my "ValueSubclass" items, and
-// this is the value that I pass in.
-// SymTabType - This is the class type, whose symtab I insert my
-// ValueSubClass items into. Most of the time it is
-// ItemParentType, but Instructions have item parents of BB's
-// but symtabtype's of a Function
+// ValueSubClass - The type of objects that I hold, e.g. Instruction.
+// ItemParentType - The type of object that owns the list, e.g. BasicBlock.
+// TraitBaseClass - The class this trait should inherit from, it should
+// inherit from ilist_traits<ValueSubClass>
//
-template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
- typename SubClass=ilist_traits<ValueSubClass> >
+template<typename ValueSubClass, typename ItemParentClass>
class SymbolTableListTraits {
- SymTabClass *SymTabObject;
+ typedef ilist_traits<ValueSubClass> TraitsClass;
ItemParentClass *ItemParent;
public:
- SymbolTableListTraits() : SymTabObject(0), ItemParent(0) {}
-
- SymTabClass *getParent() { return SymTabObject; }
- const SymTabClass *getParent() const { return SymTabObject; }
+ SymbolTableListTraits() : ItemParent(0) {}
static ValueSubClass *getPrev(ValueSubClass *V) { return V->getPrev(); }
static ValueSubClass *getNext(ValueSubClass *V) { return V->getNext(); }
@@ -68,10 +61,10 @@ public:
ilist_traits<ValueSubClass> > &L2,
ilist_iterator<ValueSubClass> first,
ilist_iterator<ValueSubClass> last);
-
//private:
- void setItemParent(ItemParentClass *IP) { ItemParent = IP; }//This is private!
- void setParent(SymTabClass *Parent); // This is private!
+ void setItemParent(ItemParentClass *IP) { ItemParent = IP; }
+ template<typename TPtr>
+ void setSymTabObject(TPtr *, TPtr);
};
} // End llvm namespace
diff --git a/include/llvm/ValueSymbolTable.h b/include/llvm/ValueSymbolTable.h
index 2436cbf42e..679fd8680e 100644
--- a/include/llvm/ValueSymbolTable.h
+++ b/include/llvm/ValueSymbolTable.h
@@ -18,10 +18,8 @@
#include "llvm/ADT/StringMap.h"
namespace llvm {
- template<typename ValueSubClass, typename ItemParentClass,
- typename SymTabClass, typename SubClass>
+ template<typename ValueSubClass, typename ItemParentClass>
class SymbolTableListTraits;
- template<typename NodeTy> struct ilist_traits;
class BasicBlock;
class Function;
class Module;
@@ -32,16 +30,11 @@ namespace llvm {
///
class ValueSymbolTable {
friend class Value;
- friend class SymbolTableListTraits<Argument, Function, Function,
- ilist_traits<Argument> >;
- friend class SymbolTableListTraits<BasicBlock, Function, Function,
- ilist_traits<BasicBlock> >;
- friend class SymbolTableListTraits<Instruction, BasicBlock, Function,
- ilist_traits<Instruction> >;
- friend class SymbolTableListTraits<Function, Module, Module,
- ilist_traits<Function> >;
- friend class SymbolTableListTraits<GlobalVariable, Module, Module,
- ilist_traits<GlobalVariable> >;
+ friend class SymbolTableListTraits<Argument, Function>;
+ friend class SymbolTableListTraits<BasicBlock, Function>;
+ friend class SymbolTableListTraits<Instruction, BasicBlock>;
+ friend class SymbolTableListTraits<Function, Module>;
+ friend class SymbolTableListTraits<GlobalVariable, Module>;
/// @name Types
/// @{
public:
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-04 14:31:33 +0000