[llvm-commits] [llvm] r66289 - in /llvm/trunk: include/llvm/Module.h lib/VMCore/Module.cpp
Daniel Dunbar
daniel at zuster.org
Fri Mar 6 14:04:43 PST 2009
Author: ddunbar
Date: Fri Mar 6 16:04:43 2009
New Revision: 66289
URL: http://llvm.org/viewvc/llvm-project?rev=66289&view=rev
Log:
Add Module::getNamedValue; use to normalize access to Module symbol
table.
- No functionality change.
Modified:
llvm/trunk/include/llvm/Module.h
llvm/trunk/lib/VMCore/Module.cpp
Modified: llvm/trunk/include/llvm/Module.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Module.h?rev=66289&r1=66288&r2=66289&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Module.h (original)
+++ llvm/trunk/include/llvm/Module.h Fri Mar 6 16:04:43 2009
@@ -183,6 +183,16 @@
}
/// @}
+/// @name Generic Value Accessors
+/// @{
+
+ /// 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 *getNamedValue(const std::string &Name) const;
+ GlobalValue *getNamedValue(const char *Name) const;
+
+/// @}
/// @name Function Accessors
/// @{
public:
Modified: llvm/trunk/lib/VMCore/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Module.cpp?rev=66289&r1=66288&r2=66289&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Module.cpp (original)
+++ llvm/trunk/lib/VMCore/Module.cpp Fri Mar 6 16:04:43 2009
@@ -127,6 +127,18 @@
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 @@
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::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 @@
// 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 @@
///
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 @@
/// 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 @@
// 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));
}
//===----------------------------------------------------------------------===//
More information about the llvm-commits
mailing list