X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FModule.cpp;h=275d4cfbf31a6907acb4d25993629fd94f4a9c15;hb=608f4b0287abf74cdbba95c9f6606f1aa03944a8;hp=0d25691cba30345bb2ef1fbcb6b4594d82addedb;hpb=c6f3ae5c66c8e0dab6a2bd9601d0e253ef9ba794;p=oota-llvm.git diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 0d25691cba3..275d4cfbf31 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -5,62 +5,77 @@ //===----------------------------------------------------------------------===// #include "llvm/Module.h" -#include "llvm/Function.h" -#include "llvm/GlobalVariable.h" #include "llvm/InstrTypes.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "Support/STLExtras.h" -#include "ValueHolderImpl.h" +#include "Support/LeakDetector.h" +#include "SymbolTableListTraitsImpl.h" +#include #include -// Instantiate Templates - This ugliness is the price we have to pay -// for having a DefHolderImpl.h file seperate from DefHolder.h! :( -// -template class ValueHolder; -template class ValueHolder; +Function *ilist_traits::createNode() { + FunctionType *FTy = + FunctionType::get(Type::VoidTy, std::vector(), false); + Function *Ret = new Function(FTy, GlobalValue::ExternalLinkage); + // This should not be garbage monitored. + LeakDetector::removeGarbageObject(Ret); + return Ret; +} +GlobalVariable *ilist_traits::createNode() { + GlobalVariable *Ret = new GlobalVariable(Type::IntTy, false, + GlobalValue::ExternalLinkage); + // This should not be garbage monitored. + LeakDetector::removeGarbageObject(Ret); + return Ret; +} + +iplist &ilist_traits::getList(Module *M) { + return M->getFunctionList(); +} +iplist &ilist_traits::getList(Module *M) { + return M->getGlobalList(); +} + +// Explicit instantiations of SymbolTableListTraits since some of the methods +// are not in the public header file... +template SymbolTableListTraits; +template SymbolTableListTraits; // Define the GlobalValueRefMap as a struct that wraps a map so that we don't // have Module.h depend on // -struct GlobalValueRefMap : public std::map{ +struct GlobalValueRefMap { + typedef std::map MapTy; + typedef MapTy::iterator iterator; + std::map Map; }; -Module::Module() : GlobalList(this, this), FunctionList(this, this) { +Module::Module(const std::string &MID) + : ModuleID(MID), Endian(BigEndian), PtrSize(Pointer64) { + FunctionList.setItemParent(this); + FunctionList.setParent(this); + GlobalList.setItemParent(this); + GlobalList.setParent(this); GVRefMap = 0; - SymTab = 0; + SymTab = new SymbolTable(); } Module::~Module() { dropAllReferences(); - GlobalList.delete_all(); + GlobalList.clear(); GlobalList.setParent(0); - FunctionList.delete_all(); + FunctionList.clear(); FunctionList.setParent(0); delete SymTab; } -SymbolTable *Module::getSymbolTableSure() { - if (!SymTab) SymTab = new SymbolTable(0); - return SymTab; +// Module::dump() - Allow printing from debugger +void Module::dump() const { + print(std::cerr); } -// hasSymbolTable() - Returns true if there is a symbol table allocated to -// this object AND if there is at least one name in it! -// -bool Module::hasSymbolTable() const { - if (!SymTab) return false; - - for (SymbolTable::const_iterator I = SymTab->begin(), E = SymTab->end(); - I != E; ++I) - if (I->second.begin() != I->second.end()) - return true; // Found nonempty type plane! - - return false; -} - - // getOrInsertFunction - Look up the specified function in the module symbol // table. If it does not exist, add a prototype for the function and return // it. This is nice because it allows most passes to get away with not handling @@ -68,13 +83,13 @@ bool Module::hasSymbolTable() const { // Function *Module::getOrInsertFunction(const std::string &Name, const FunctionType *Ty) { - SymbolTable *SymTab = getSymbolTableSure(); + SymbolTable &SymTab = getSymbolTable(); // See if we have a definitions for the specified function already... - if (Value *V = SymTab->lookup(PointerType::get(Ty), Name)) { + if (Value *V = SymTab.lookup(PointerType::get(Ty), Name)) { return cast(V); // Yup, got it } else { // Nope, add one - Function *New = new Function(Ty, false, Name); + Function *New = new Function(Ty, GlobalVariable::ExternalLinkage, Name); FunctionList.push_back(New); return New; // Return the new prototype... } @@ -84,10 +99,8 @@ Function *Module::getOrInsertFunction(const std::string &Name, // If it does not exist, return null. // Function *Module::getFunction(const std::string &Name, const FunctionType *Ty) { - SymbolTable *SymTab = getSymbolTable(); - if (SymTab == 0) return 0; // No symtab, no symbols... - - return cast_or_null(SymTab->lookup(PointerType::get(Ty), Name)); + SymbolTable &SymTab = getSymbolTable(); + return cast_or_null(SymTab.lookup(PointerType::get(Ty), Name)); } // addTypeName - Insert an entry in the symbol table mapping Str to Type. If @@ -95,28 +108,88 @@ Function *Module::getFunction(const std::string &Name, const FunctionType *Ty) { // table is not modified. // bool Module::addTypeName(const std::string &Name, const Type *Ty) { - SymbolTable *ST = getSymbolTableSure(); + SymbolTable &ST = getSymbolTable(); - if (ST->lookup(Type::TypeTy, Name)) return true; // Already in symtab... + if (ST.lookup(Type::TypeTy, Name)) return true; // Already in symtab... // Not in symbol table? Set the name with the Symtab as an argument so the // type knows what to update... - ((Value*)Ty)->setName(Name, ST); + ((Value*)Ty)->setName(Name, &ST); return false; } +/// getMainFunction - This function looks up main efficiently. This is such a +/// common case, that it is a method in Module. If main cannot be found, a +/// null pointer is returned. +/// +Function *Module::getMainFunction() { + std::vector Params; + + // int main(void)... + if (Function *F = getFunction("main", FunctionType::get(Type::IntTy, + Params, false))) + return F; + + // void main(void)... + if (Function *F = getFunction("main", FunctionType::get(Type::VoidTy, + Params, false))) + return F; + + Params.push_back(Type::IntTy); + + // int main(int argc)... + if (Function *F = getFunction("main", FunctionType::get(Type::IntTy, + Params, false))) + return F; + + // void main(int argc)... + if (Function *F = getFunction("main", FunctionType::get(Type::VoidTy, + Params, false))) + return F; + + for (unsigned i = 0; i != 2; ++i) { // Check argv and envp + Params.push_back(PointerType::get(PointerType::get(Type::SByteTy))); + + // int main(int argc, char **argv)... + if (Function *F = getFunction("main", FunctionType::get(Type::IntTy, + Params, false))) + return F; + + // void main(int argc, char **argv)... + if (Function *F = getFunction("main", FunctionType::get(Type::VoidTy, + Params, false))) + return F; + } + + // Ok, try to find main the hard way... + return getNamedFunction("main"); +} + +/// getNamedFunction - Return the first function in the module with the +/// specified name, of arbitrary type. This method returns null if a function +/// with the specified name is not found. +/// +Function *Module::getNamedFunction(const std::string &Name) { + // Loop over all of the functions, looking for the function desired + for (iterator I = begin(), E = end(); I != E; ++I) + if (I->getName() == Name) + return I; + return 0; // function not found... +} + + + // getTypeName - If there is at least one entry in the symbol table for the // specified type, return it. // std::string Module::getTypeName(const Type *Ty) { - const SymbolTable *ST = getSymbolTable(); - if (ST == 0) return ""; // No symbol table, must not have an entry... - if (ST->find(Type::TypeTy) == ST->end()) + const SymbolTable &ST = getSymbolTable(); + if (ST.find(Type::TypeTy) == ST.end()) return ""; // No names for types... - SymbolTable::type_const_iterator TI = ST->type_begin(Type::TypeTy); - SymbolTable::type_const_iterator TE = ST->type_end(Type::TypeTy); + SymbolTable::type_const_iterator TI = ST.type_begin(Type::TypeTy); + SymbolTable::type_const_iterator TE = ST.type_end(Type::TypeTy); while (TI != TE && TI->second != (const Value*)Ty) ++TI; @@ -127,34 +200,29 @@ std::string Module::getTypeName(const Type *Ty) { } -// dropAllReferences() - This function causes all the subinstructions to "let -// go" of all references that they are maintaining. This allows one to -// 'delete' a whole class at a time, even though there may be circular -// references... first all references are dropped, and all use counts go to -// zero. Then everything is delete'd for real. Note that no operations are -// valid on an object that has "dropped all references", except operator -// delete. +// dropAllReferences() - This function causes all the subelementss to "let go" +// of all references that they are maintaining. This allows one to 'delete' a +// whole module at a time, even though there may be circular references... first +// all references are dropped, and all use counts go to zero. Then everything +// is delete'd for real. Note that no operations are valid on an object that +// has "dropped all references", except operator delete. // void Module::dropAllReferences() { - for_each(FunctionList.begin(), FunctionList.end(), - std::mem_fun(&Function::dropAllReferences)); + for(Module::iterator I = begin(), E = end(); I != E; ++I) + I->dropAllReferences(); - for_each(GlobalList.begin(), GlobalList.end(), - std::mem_fun(&GlobalVariable::dropAllReferences)); + for(Module::giterator I = gbegin(), E = gend(); I != E; ++I) + I->dropAllReferences(); // If there are any GlobalVariable references still out there, nuke them now. // Since all references are hereby dropped, nothing could possibly reference - // them still. - if (GVRefMap) { - for (GlobalValueRefMap::iterator I = GVRefMap->begin(), E = GVRefMap->end(); - I != E; ++I) { - // Delete the ConstantPointerRef node... - I->second->destroyConstant(); - } - - // Since the table is empty, we can now delete it... - delete GVRefMap; - } + // them still. Note that destroying all of the constant pointer refs will + // eventually cause the GVRefMap field to be set to null (by + // destroyConstantPointerRef, below). + // + while (GVRefMap) + // Delete the ConstantPointerRef node... + GVRefMap->Map.begin()->second->destroyConstant(); } // Accessor for the underlying GlobalValRefMap... @@ -162,24 +230,45 @@ ConstantPointerRef *Module::getConstantPointerRef(GlobalValue *V){ // Create ref map lazily on demand... if (GVRefMap == 0) GVRefMap = new GlobalValueRefMap(); - GlobalValueRefMap::iterator I = GVRefMap->find(V); - if (I != GVRefMap->end()) return I->second; + GlobalValueRefMap::iterator I = GVRefMap->Map.find(V); + if (I != GVRefMap->Map.end()) return I->second; ConstantPointerRef *Ref = new ConstantPointerRef(V); - GVRefMap->insert(std::make_pair(V, Ref)); - + GVRefMap->Map[V] = Ref; return Ref; } +void Module::destroyConstantPointerRef(ConstantPointerRef *CPR) { + assert(GVRefMap && "No map allocated, but we have a CPR?"); + if (!GVRefMap->Map.erase(CPR->getValue())) // Remove it from the map... + assert(0 && "ConstantPointerRef not found in module CPR map!"); + + if (GVRefMap->Map.empty()) { // If the map is empty, delete it. + delete GVRefMap; + GVRefMap = 0; + } +} + void Module::mutateConstantPointerRef(GlobalValue *OldGV, GlobalValue *NewGV) { - GlobalValueRefMap::iterator I = GVRefMap->find(OldGV); - assert(I != GVRefMap->end() && + assert(OldGV != NewGV && "Cannot mutate to the same global!"); + GlobalValueRefMap::iterator I = GVRefMap->Map.find(OldGV); + assert(I != GVRefMap->Map.end() && "mutateConstantPointerRef; OldGV not in table!"); ConstantPointerRef *Ref = I->second; // Remove the old entry... - GVRefMap->erase(I); - - // Insert the new entry... - GVRefMap->insert(std::make_pair(NewGV, Ref)); + GVRefMap->Map.erase(I); + + // Check to see if a CPR already exists for NewGV + I = GVRefMap->Map.lower_bound(NewGV); + + if (I == GVRefMap->Map.end() || I->first != NewGV) { + // Insert the new entry... + GVRefMap->Map.insert(I, std::make_pair(NewGV, Ref)); + } else { + // Otherwise, an entry already exists for the current global value. + // Completely replace the old CPR with the existing one... + Ref->replaceAllUsesWith(I->second); + delete Ref; + } }