diff options
Diffstat (limited to 'lib/VMCore/Module.cpp')
| -rw-r--r-- | lib/VMCore/Module.cpp | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 896245d69e..47233aea68 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -127,6 +127,18 @@ Module::PointerSize Module::getPointerSize() const { return ret; } +/// getNamedValue - Return the first global value in the module with +/// the specified name, of arbitrary type. This method returns null +/// if a global with the specified name is not found. +GlobalValue *Module::getNamedValue(const std::string &Name) const { + return cast_or_null<GlobalValue>(getValueSymbolTable().lookup(Name)); +} + +GlobalValue *Module::getNamedValue(const char *Name) const { + llvm::Value *V = getValueSymbolTable().lookup(Name, Name+strlen(Name)); + return cast_or_null<GlobalValue>(V); +} + //===----------------------------------------------------------------------===// // Methods for easy access to the functions in the module. // @@ -139,10 +151,8 @@ Module::PointerSize Module::getPointerSize() const { Constant *Module::getOrInsertFunction(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<GlobalValue>(SymTab.lookup(Name)); + GlobalValue *F = getNamedValue(Name); if (F == 0) { // Nope, add it Function *New = Function::Create(Ty, GlobalVariable::ExternalLinkage, Name); @@ -174,10 +184,8 @@ Constant *Module::getOrInsertFunction(const std::string &Name, 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<GlobalValue>(SymTab.lookup(Name)); + GlobalValue *F = getNamedValue(Name); if (F == 0) { // Nope, add it Function *New = Function::Create(Ty, GlobalVariable::ExternalLinkage, Name); @@ -240,13 +248,11 @@ Constant *Module::getOrInsertFunction(const std::string &Name, // If it does not exist, return null. // Function *Module::getFunction(const std::string &Name) const { - const ValueSymbolTable &SymTab = getValueSymbolTable(); - return dyn_cast_or_null<Function>(SymTab.lookup(Name)); + return dyn_cast_or_null<Function>(getNamedValue(Name)); } Function *Module::getFunction(const char *Name) const { - const ValueSymbolTable &SymTab = getValueSymbolTable(); - return dyn_cast_or_null<Function>(SymTab.lookup(Name, Name+strlen(Name))); + return dyn_cast_or_null<Function>(getNamedValue(Name)); } //===----------------------------------------------------------------------===// @@ -262,11 +268,10 @@ Function *Module::getFunction(const char *Name) const { /// GlobalVariable *Module::getGlobalVariable(const std::string &Name, bool AllowLocal) const { - if (Value *V = ValSymTab->lookup(Name)) { - GlobalVariable *Result = dyn_cast<GlobalVariable>(V); - if (Result && (AllowLocal || !Result->hasLocalLinkage())) + if (GlobalVariable *Result = + dyn_cast_or_null<GlobalVariable>(getNamedValue(Name))) + if (AllowLocal || !Result->hasLocalLinkage()) return Result; - } return 0; } @@ -277,10 +282,8 @@ GlobalVariable *Module::getGlobalVariable(const std::string &Name, /// 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<GlobalVariable>(SymTab.lookup(Name)); + GlobalVariable *GV = dyn_cast_or_null<GlobalVariable>(getNamedValue(Name)); if (GV == 0) { // Nope, add it GlobalVariable *New = @@ -306,8 +309,7 @@ Constant *Module::getOrInsertGlobal(const std::string &Name, const Type *Ty) { // If it does not exist, return null. // GlobalAlias *Module::getNamedAlias(const std::string &Name) const { - const ValueSymbolTable &SymTab = getValueSymbolTable(); - return dyn_cast_or_null<GlobalAlias>(SymTab.lookup(Name)); + return dyn_cast_or_null<GlobalAlias>(getNamedValue(Name)); } //===----------------------------------------------------------------------===// |