X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FModule.cpp;h=896245d69e6754cb2b21cb9304f7b164fcc00c05;hb=2625f9b2e4388a957286063f6c7fe5406fd0ca7a;hp=8aab595bd2b09d2d4d2067a1c2afea3799d1f2cd;hpb=688b0490e22eb67623f5aaa24406209be74efcb2;p=oota-llvm.git diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 8aab595bd2b..896245d69e6 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -2,8 +2,8 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -23,7 +23,6 @@ #include #include #include -#include using namespace llvm; //===----------------------------------------------------------------------===// @@ -32,9 +31,8 @@ using namespace llvm; Function *ilist_traits::createSentinel() { FunctionType *FTy = - FunctionType::get(Type::VoidTy, std::vector(), false, - std::vector() ); - Function *Ret = new Function(FTy, GlobalValue::ExternalLinkage); + FunctionType::get(Type::VoidTy, std::vector(), false); + Function *Ret = Function::Create(FTy, GlobalValue::ExternalLinkage); // This should not be garbage monitored. LeakDetector::removeGarbageObject(Ret); return Ret; @@ -46,6 +44,13 @@ GlobalVariable *ilist_traits::createSentinel() { LeakDetector::removeGarbageObject(Ret); return Ret; } +GlobalAlias *ilist_traits::createSentinel() { + GlobalAlias *Ret = new GlobalAlias(Type::Int32Ty, + GlobalValue::ExternalLinkage); + // This should not be garbage monitored. + LeakDetector::removeGarbageObject(Ret); + return Ret; +} iplist &ilist_traits::getList(Module *M) { return M->getFunctionList(); @@ -53,11 +58,15 @@ iplist &ilist_traits::getList(Module *M) { iplist &ilist_traits::getList(Module *M) { return M->getGlobalList(); } +iplist &ilist_traits::getList(Module *M) { + return M->getAliasList(); +} // Explicit instantiations of SymbolTableListTraits since some of the methods // are not in the public header file. -template class SymbolTableListTraits; -template class SymbolTableListTraits; +template class SymbolTableListTraits; +template class SymbolTableListTraits; +template class SymbolTableListTraits; //===----------------------------------------------------------------------===// // Primitive Module methods. @@ -65,10 +74,6 @@ template class SymbolTableListTraits; Module::Module(const std::string &MID) : ModuleID(MID), DataLayout("") { - FunctionList.setItemParent(this); - FunctionList.setParent(this); - GlobalList.setItemParent(this); - GlobalList.setParent(this); ValSymTab = new ValueSymbolTable(); TypeSymTab = new TypeSymbolTable(); } @@ -76,19 +81,13 @@ Module::Module(const std::string &MID) Module::~Module() { dropAllReferences(); GlobalList.clear(); - GlobalList.setParent(0); FunctionList.clear(); - FunctionList.setParent(0); + AliasList.clear(); LibraryList.clear(); delete ValSymTab; delete TypeSymTab; } -// Module::dump() - Allow printing from debugger -void Module::dump() const { - print(*cerr.stream()); -} - /// Target endian information... Module::Endianness Module::getEndianness() const { std::string temp = DataLayout; @@ -138,41 +137,72 @@ Module::PointerSize Module::getPointerSize() const { // the symbol table directly for this common task. // Constant *Module::getOrInsertFunction(const std::string &Name, - const FunctionType *Ty) { + const FunctionType *Ty, + AttrListPtr AttributeList) { ValueSymbolTable &SymTab = getValueSymbolTable(); // See if we have a definition for the specified function already. GlobalValue *F = dyn_cast_or_null(SymTab.lookup(Name)); if (F == 0) { // Nope, add it - Function *New = new Function(Ty, GlobalVariable::ExternalLinkage, Name); + Function *New = Function::Create(Ty, GlobalVariable::ExternalLinkage, Name); + if (!New->isIntrinsic()) // Intrinsics get attrs set on construction + New->setAttributes(AttributeList); FunctionList.push_back(New); return New; // Return the new prototype. } // Okay, the function exists. Does it have externally visible linkage? - if (F->hasInternalLinkage()) { - // Rename the function. - F->setName(SymTab.getUniqueName(F->getName())); + if (F->hasLocalLinkage()) { + // Clear the function's name. + F->setName(""); // Retry, now there won't be a conflict. - return getOrInsertFunction(Name, Ty); + Constant *NewF = getOrInsertFunction(Name, Ty); + F->setName(&Name[0], Name.size()); + return NewF; } // If the function exists but has the wrong type, return a bitcast to the // right type. - if (F->getType() != PointerType::get(Ty)) - return ConstantExpr::getBitCast(F, PointerType::get(Ty)); + if (F->getType() != PointerType::getUnqual(Ty)) + return ConstantExpr::getBitCast(F, PointerType::getUnqual(Ty)); // Otherwise, we just found the existing function or a prototype. return F; } +Constant *Module::getOrInsertTargetIntrinsic(const std::string &Name, + const FunctionType *Ty, + AttrListPtr AttributeList) { + ValueSymbolTable &SymTab = getValueSymbolTable(); + + // See if we have a definition for the specified function already. + GlobalValue *F = dyn_cast_or_null(SymTab.lookup(Name)); + if (F == 0) { + // Nope, add it + Function *New = Function::Create(Ty, GlobalVariable::ExternalLinkage, Name); + New->setAttributes(AttributeList); + FunctionList.push_back(New); + return New; // Return the new prototype. + } + + // Otherwise, we just found the existing function or a prototype. + return F; +} + +Constant *Module::getOrInsertFunction(const std::string &Name, + const FunctionType *Ty) { + AttrListPtr AttributeList = AttrListPtr::get((AttributeWithIndex *)0, 0); + return getOrInsertFunction(Name, Ty, AttributeList); +} + // 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 version of the method takes a null terminated list of function // arguments, which makes it easier for clients to use. // Constant *Module::getOrInsertFunction(const std::string &Name, + AttrListPtr AttributeList, const Type *RetTy, ...) { va_list Args; va_start(Args, RetTy); @@ -185,9 +215,26 @@ Constant *Module::getOrInsertFunction(const std::string &Name, va_end(Args); // Build the function type and chain to the other getOrInsertFunction... - return getOrInsertFunction(Name, FunctionType::get(RetTy, ArgTys, false)); + return getOrInsertFunction(Name, FunctionType::get(RetTy, ArgTys, false), + AttributeList); } +Constant *Module::getOrInsertFunction(const std::string &Name, + const Type *RetTy, ...) { + va_list Args; + va_start(Args, RetTy); + + // Build the list of argument types... + std::vector ArgTys; + while (const Type *ArgTy = va_arg(Args, const Type*)) + ArgTys.push_back(ArgTy); + + va_end(Args); + + // Build the function type and chain to the other getOrInsertFunction... + return getOrInsertFunction(Name, FunctionType::get(RetTy, ArgTys, false), + AttrListPtr::get((AttributeWithIndex *)0, 0)); +} // getFunction - Look up the specified function in the module symbol table. // If it does not exist, return null. @@ -197,6 +244,11 @@ Function *Module::getFunction(const std::string &Name) const { return dyn_cast_or_null(SymTab.lookup(Name)); } +Function *Module::getFunction(const char *Name) const { + const ValueSymbolTable &SymTab = getValueSymbolTable(); + return dyn_cast_or_null(SymTab.lookup(Name, Name+strlen(Name))); +} + //===----------------------------------------------------------------------===// // Methods for easy access to the global variables in the module. // @@ -205,19 +257,59 @@ Function *Module::getFunction(const std::string &Name) const { /// symbol table. If it does not exist, return null. The type argument /// should be the underlying type of the global, i.e., it should not have /// the top-level PointerType, which represents the address of the global. -/// If AllowInternal is set to true, this function will return types that -/// have InternalLinkage. By default, these types are not returned. +/// If AllowLocal is set to true, this function will return types that +/// have an local. By default, these types are not returned. /// GlobalVariable *Module::getGlobalVariable(const std::string &Name, - bool AllowInternal) const { + bool AllowLocal) const { if (Value *V = ValSymTab->lookup(Name)) { GlobalVariable *Result = dyn_cast(V); - if (Result && (AllowInternal || !Result->hasInternalLinkage())) + if (Result && (AllowLocal || !Result->hasLocalLinkage())) return Result; } return 0; } +/// getOrInsertGlobal - Look up the specified global in the module symbol table. +/// 1. If it does not exist, add a declaration of the global and return it. +/// 2. Else, the global exists but has the wrong type: return the function +/// with a constantexpr cast to the right type. +/// 3. Finally, if the existing global is the correct delclaration, return the +/// existing global. +Constant *Module::getOrInsertGlobal(const std::string &Name, const Type *Ty) { + ValueSymbolTable &SymTab = getValueSymbolTable(); + + // See if we have a definition for the specified global already. + GlobalVariable *GV = dyn_cast_or_null(SymTab.lookup(Name)); + if (GV == 0) { + // Nope, add it + GlobalVariable *New = + new GlobalVariable(Ty, false, GlobalVariable::ExternalLinkage, 0, Name); + GlobalList.push_back(New); + return New; // Return the new declaration. + } + + // If the variable exists but has the wrong type, return a bitcast to the + // right type. + if (GV->getType() != PointerType::getUnqual(Ty)) + return ConstantExpr::getBitCast(GV, PointerType::getUnqual(Ty)); + + // Otherwise, we just found the existing function or a prototype. + return GV; +} + +//===----------------------------------------------------------------------===// +// Methods for easy access to the global variables in the module. +// + +// getNamedAlias - Look up the specified global in the module symbol table. +// If it does not exist, return null. +// +GlobalAlias *Module::getNamedAlias(const std::string &Name) const { + const ValueSymbolTable &SymTab = getValueSymbolTable(); + return dyn_cast_or_null(SymTab.lookup(Name)); +} + //===----------------------------------------------------------------------===// // Methods for easy access to the types in the module. // @@ -282,6 +374,9 @@ void Module::dropAllReferences() { for(Module::global_iterator I = global_begin(), E = global_end(); I != E; ++I) I->dropAllReferences(); + + for(Module::alias_iterator I = alias_begin(), E = alias_end(); I != E; ++I) + I->dropAllReferences(); } void Module::addLibrary(const std::string& Lib) { @@ -300,4 +395,3 @@ void Module::removeLibrary(const std::string& Lib) { return; } } -