//
//===----------------------------------------------------------------------===//
-#include "llvm/ValueHolderImpl.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/SymbolTable.h"
#include "llvm/Module.h"
-#include "llvm/Function.h"
-#include "llvm/GlobalVariable.h"
-#include "llvm/BasicBlock.h"
+#include "llvm/DerivedTypes.h"
#include "llvm/iOther.h"
+#include "Support/LeakDetector.h"
+#include "SymbolTableListTraitsImpl.h"
+
+BasicBlock *ilist_traits<BasicBlock>::createNode() {
+ BasicBlock *Ret = new BasicBlock();
+ // This should not be garbage monitored.
+ LeakDetector::removeGarbageObject(Ret);
+ return Ret;
+}
+
+iplist<BasicBlock> &ilist_traits<BasicBlock>::getList(Function *F) {
+ return F->getBasicBlockList();
+}
+
+Argument *ilist_traits<Argument>::createNode() {
+ Argument *Ret = new Argument(Type::IntTy);
+ // This should not be garbage monitored.
+ LeakDetector::removeGarbageObject(Ret);
+ return Ret;
+}
+
+iplist<Argument> &ilist_traits<Argument>::getList(Function *F) {
+ return F->getArgumentList();
+}
+
+// Explicit instantiations of SymbolTableListTraits since some of the methods
+// are not in the public header file...
+template SymbolTableListTraits<Argument, Function, Function>;
+template SymbolTableListTraits<BasicBlock, Function, Function>;
//===----------------------------------------------------------------------===//
-// Function Implementation
+// Argument Implementation
//===----------------------------------------------------------------------===//
+Argument::Argument(const Type *Ty, const std::string &Name, Function *Par)
+ : Value(Ty, Value::ArgumentVal, Name) {
+ Parent = 0;
-// Instantiate Templates - This ugliness is the price we have to pay
-// for having a ValueHolderImpl.h file seperate from ValueHolder.h! :(
-//
-template class ValueHolder<FunctionArgument, Function, Function>;
-template class ValueHolder<BasicBlock , Function, Function>;
+ // Make sure that we get added to a function
+ LeakDetector::addGarbageObject(this);
+
+ if (Par)
+ Par->getArgumentList().push_back(this);
+}
+
+
+// Specialize setName to take care of symbol table majik
+void Argument::setName(const std::string &name, SymbolTable *ST) {
+ Function *P;
+ assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
+ "Invalid symtab argument!");
+ if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
+ Value::setName(name);
+ if (P && hasName()) P->getSymbolTable().insert(this);
+}
+
+void Argument::setParent(Function *parent) {
+ if (getParent())
+ LeakDetector::addGarbageObject(this);
+ Parent = parent;
+ if (getParent())
+ LeakDetector::removeGarbageObject(this);
+}
+
+
+//===----------------------------------------------------------------------===//
+// Function Implementation
+//===----------------------------------------------------------------------===//
Function::Function(const FunctionType *Ty, bool isInternal,
- const std::string &name)
- : GlobalValue(PointerType::get(Ty), Value::FunctionVal, isInternal, name),
- SymTabValue(this), BasicBlocks(this), ArgumentList(this, this) {
+ const std::string &name, Module *ParentModule)
+ : GlobalValue(PointerType::get(Ty), Value::FunctionVal, isInternal, name) {
+ BasicBlocks.setItemParent(this);
+ BasicBlocks.setParent(this);
+ ArgumentList.setItemParent(this);
+ ArgumentList.setParent(this);
+ SymTab = new SymbolTable();
+
+ // Create the arguments vector, all arguments start out unnamed.
+ for (unsigned i = 0, e = Ty->getNumParams(); i != e; ++i) {
+ assert(Ty->getParamType(i) != Type::VoidTy &&
+ "Cannot have void typed arguments!");
+ ArgumentList.push_back(new Argument(Ty->getParamType(i)));
+ }
+
+ // Make sure that we get added to a function
+ LeakDetector::addGarbageObject(this);
+
+ if (ParentModule)
+ ParentModule->getFunctionList().push_back(this);
}
Function::~Function() {
dropAllReferences(); // After this it is safe to delete instructions.
- // TODO: Should remove from the end, not the beginning of vector!
- iterator BI = begin();
- while ((BI = begin()) != end())
- delete BasicBlocks.remove(BI);
+ BasicBlocks.clear(); // Delete all basic blocks...
// Delete all of the method arguments and unlink from symbol table...
- ArgumentList.delete_all();
+ ArgumentList.clear();
ArgumentList.setParent(0);
+ delete SymTab;
}
// Specialize setName to take care of symbol table majik
void Function::setName(const std::string &name, SymbolTable *ST) {
Module *P;
- assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+ assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
"Invalid symtab argument!");
- if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
+ if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
Value::setName(name);
- if (P && getName() != "") P->getSymbolTableSure()->insert(this);
+ if (P && getName() != "") P->getSymbolTable().insert(this);
}
void Function::setParent(Module *parent) {
+ if (getParent())
+ LeakDetector::addGarbageObject(this);
Parent = parent;
-
- // Relink symbol tables together...
- setParentSymTab(Parent ? Parent->getSymbolTableSure() : 0);
+ if (getParent())
+ LeakDetector::removeGarbageObject(this);
}
const FunctionType *Function::getFunctionType() const {
// delete.
//
void Function::dropAllReferences() {
- for_each(begin(), end(), std::mem_fun(&BasicBlock::dropAllReferences));
+ for (iterator I = begin(), E = end(); I != E; ++I)
+ I->dropAllReferences();
}
//===----------------------------------------------------------------------===//
//===----------------------------------------------------------------------===//
GlobalVariable::GlobalVariable(const Type *Ty, bool constant, bool isIntern,
- Constant *Initializer = 0,
- const std::string &Name = "")
+ Constant *Initializer,
+ const std::string &Name, Module *ParentModule)
: GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, isIntern, Name),
isConstantGlobal(constant) {
if (Initializer) Operands.push_back(Use((Value*)Initializer, this));
+
+ LeakDetector::addGarbageObject(this);
+
+ if (ParentModule)
+ ParentModule->getGlobalList().push_back(this);
+}
+
+void GlobalVariable::setParent(Module *parent) {
+ if (getParent())
+ LeakDetector::addGarbageObject(this);
+ Parent = parent;
+ if (getParent())
+ LeakDetector::removeGarbageObject(this);
}
// Specialize setName to take care of symbol table majik
void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
Module *P;
- assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+ assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
"Invalid symtab argument!");
- if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
+ if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
Value::setName(name);
- if (P && getName() != "") P->getSymbolTableSure()->insert(this);
+ if (P && getName() != "") P->getSymbolTable().insert(this);
}