6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Add Module::getNamedValue; use to normalize access to Module symbol

Browse Source 
table.
 - No functionality change.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66289 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-03-06 22:04:43 +00:00
parent 3a56d14641
commit f56ec6423c
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/Module.h
View File

@ -182,6 +182,16 @@ public:
GlobalScopeAsm += '\n';
}
/// @}
/// @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
/// @{

40
lib/VMCore/Module.cpp
View File

@ -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));
}
//===----------------------------------------------------------------------===//