diff options
| -rw-r--r-- | include/llvm/Module.h | 17 | ||||
| -rw-r--r-- | lib/VMCore/Module.cpp | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/include/llvm/Module.h b/include/llvm/Module.h index 9d0b2b62f2..9c8607a188 100644 --- a/include/llvm/Module.h +++ b/include/llvm/Module.h @@ -28,9 +28,20 @@ class FunctionType; template<> struct ilist_traits<Function> : 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; } + + // createSentinel is used to get hold of the node that marks the end of the + // list... (same trick used here as in ilist_traits<Instruction>) + Function *createSentinel() const { + return static_cast<Function*>(&Sentinel); + } + static void destroySentinel(Function*) {} + + Function *provideInitialHead() const { return createSentinel(); } + Function *ensureHead(Function*) const { return createSentinel(); } + static void noteHead(Function*, Function*) {} + +private: + mutable ilist_node<Function> Sentinel; }; template<> struct ilist_traits<GlobalVariable> : public SymbolTableListTraits<GlobalVariable, Module> { diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 25d297a03e..a598005e2a 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -29,14 +29,6 @@ using namespace llvm; // Methods to implement the globals and functions lists. // -Function *ilist_traits<Function>::createSentinel() { - FunctionType *FTy = - FunctionType::get(Type::VoidTy, std::vector<const Type*>(), false); - Function *Ret = Function::Create(FTy, GlobalValue::ExternalLinkage); - // This should not be garbage monitored. - LeakDetector::removeGarbageObject(Ret); - return Ret; -} GlobalVariable *ilist_traits<GlobalVariable>::createSentinel() { GlobalVariable *Ret = new GlobalVariable(Type::Int32Ty, false, GlobalValue::ExternalLinkage); |