Changes in directory llvm/lib/VMCore:
Module.cpp updated: 1.71 -> 1.72 --- Log message: Change the interface to Module::getOrInsertFunction to be easier to use, to resolve PR1088: http://llvm.org/PR1088 , and to help PR411: http://llvm.org/PR411 . --- Diffs of the changes: (+24 -12) Module.cpp | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) Index: llvm/lib/VMCore/Module.cpp diff -u llvm/lib/VMCore/Module.cpp:1.71 llvm/lib/VMCore/Module.cpp:1.72 --- llvm/lib/VMCore/Module.cpp:1.71 Sat Jan 6 01:24:44 2007 +++ llvm/lib/VMCore/Module.cpp Sun Jan 7 02:09:25 2007 @@ -152,23 +152,35 @@ // Methods for easy access to the functions in the module. // -// 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 -// the symbol table directly for this common task. -// -Function *Module::getOrInsertFunction(const std::string &Name, +Constant *Module::getOrInsertFunction(const std::string &Name, const FunctionType *Ty) { SymbolTable &SymTab = getValueSymbolTable(); - // See if we have a definitions for the specified function already... - if (Value *V = SymTab.lookup(PointerType::get(Ty), Name)) { - return cast<Function>(V); // Yup, got it - } else { // Nope, add one + // See if we have a definitions for the specified function already. + Function *F = + dyn_cast_or_null<Function>(SymTab.lookup(PointerType::get(Ty), Name)); + if (F == 0) { + // Nope, add it. Function *New = new Function(Ty, GlobalVariable::ExternalLinkage, Name); FunctionList.push_back(New); - return New; // Return the new prototype... + 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->getType(), F->getName())); + // Retry, now there won't be a conflict. + return getOrInsertFunction(Name, Ty); + } + + // If the function exists but has the wrong type, return a bitcast to the + // right type. + if (F->getFunctionType() != Ty) + return ConstantExpr::getBitCast(F, PointerType::get(Ty)); + + // Otherwise, we just found the existing function or a prototype. + return F; } // getOrInsertFunction - Look up the specified function in the module symbol @@ -176,7 +188,7 @@ // This version of the method takes a null terminated list of function // arguments, which makes it easier for clients to use. // -Function *Module::getOrInsertFunction(const std::string &Name, +Constant *Module::getOrInsertFunction(const std::string &Name, const Type *RetTy, ...) { va_list Args; va_start(Args, RetTy); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
