6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-26 07:34:06 +00:00
Code Issues Projects Releases Wiki Activity

Switch ValueSymbolTable to StringRef based API.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76894 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-07-23 18:52:12 +00:00
parent e6c42dd6d3
commit bc8d813f71
4 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/ValueSymbolTable.h
View File

@ -24,6 +24,7 @@ namespace llvm {
class BasicBlock;
class Function;
class Module;
class StringRef;
/// This class provides a symbol table of name/value pairs. It is essentially
/// a std::map<std::string,Value*> but has a controlled interface provided by
@ -62,12 +63,11 @@ public:
/// @{
public:
/// This method finds the value with the given \p name in the
/// This method finds the value with the given \p Name in the
/// the symbol table.
/// @returns the value associated with the \p name
/// @returns the value associated with the \p Name
/// @brief Lookup a named Value.
Value *lookup(const std::string &name) const;
Value *lookup(const char *NameBegin, const char *NameEnd) const;
Value *lookup(const StringRef &Name) const { return vmap.lookup(Name); }
/// @returns true iff the symbol table is empty
/// @brief Determine if the symbol table is empty
@ -110,7 +110,7 @@ private:
/// createValueName - This method attempts to create a value name and insert
/// it into the symbol table with the specified name. If it conflicts, it
/// auto-renames the name and returns that instead.
ValueName *createValueName(const char *NameStart, unsigned NameLen, Value *V);
ValueName *createValueName(const StringRef &Name, Value *V);
/// This method removes a value from the symbol table. It leaves the
/// ValueName attached to the value, but it is no longer inserted in the

6
lib/Linker/LinkModules.cpp
View File

@ -548,8 +548,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
// Check to see if may have to link the global with the global, alias or
// function.
if (SGV->hasName() && !SGV->hasLocalLinkage())
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SGV->getNameStart(),
SGV->getNameEnd()));
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SGV->getNameRef()));
// If we found a global with the same name in the dest module, but it has
// internal linkage, we are really not doing any linkage here.
@ -942,8 +941,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
// Check to see if may have to link the function with the global, alias or
// function.
if (SF->hasName() && !SF->hasLocalLinkage())
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SF->getNameStart(),
SF->getNameEnd()));
DGV = cast_or_null<GlobalValue>(DestSymTab.lookup(SF->getNameRef()));
// If we found a global with the same name in the dest module, but it has
// internal linkage, we are really not doing any linkage here.

2
lib/VMCore/Module.cpp
View File

@ -118,7 +118,7 @@ GlobalValue *Module::getNamedValue(const std::string &Name) const {
}
GlobalValue *Module::getNamedValue(const char *Name) const {
llvm::Value *V = getValueSymbolTable().lookup(Name, Name+strlen(Name));
llvm::Value *V = getValueSymbolTable().lookup(Name);
return cast_or_null<GlobalValue>(V);
}

27
lib/VMCore/ValueSymbolTable.cpp
View File

@ -30,24 +30,6 @@ ValueSymbolTable::~ValueSymbolTable() {
#endif
}
// lookup a value - Returns null on failure...
//
Value *ValueSymbolTable::lookup(const std::string &Name) const {
const_iterator VI = vmap.find(Name);
if (VI != vmap.end()) // We found the symbol
return VI->getValue();
return 0;
}
Value *ValueSymbolTable::lookup(const char *NameBegin,
const char *NameEnd) const {
// FIXME: ValueSymbolTable should move to a StringRef based API.
const_iterator VI = vmap.find(StringRef(NameBegin, NameEnd - NameBegin));
if (VI != vmap.end()) // We found the symbol
return VI->getValue();
return 0;
}
// Insert a value into the symbol table with the specified name...
//
void ValueSymbolTable::reinsertValue(Value* V) {
@ -93,10 +75,9 @@ void ValueSymbolTable::removeValueName(ValueName *V) {
/// createValueName - This method attempts to create a value name and insert
/// it into the symbol table with the specified name. If it conflicts, it
/// auto-renames the name and returns that instead.
ValueName *ValueSymbolTable::createValueName(const char *NameStart,
unsigned NameLen, Value *V) {
ValueName *ValueSymbolTable::createValueName(const StringRef &Name, Value *V) {
// In the common case, the name is not already in the symbol table.
ValueName &Entry = vmap.GetOrCreateValue(StringRef(NameStart, NameLen));
ValueName &Entry = vmap.GetOrCreateValue(Name);
if (Entry.getValue() == 0) {
Entry.setValue(V);
//DEBUG(DOUT << " Inserted value: " << Entry.getKeyData() << ": "
@ -105,11 +86,11 @@ ValueName *ValueSymbolTable::createValueName(const char *NameStart,
}
// Otherwise, there is a naming conflict. Rename this value.
SmallString<128> UniqueName(NameStart, NameStart+NameLen);
SmallString<128> UniqueName(Name.begin(), Name.end());
while (1) {
// Trim any suffix off.
UniqueName.resize(NameLen);
UniqueName.resize(Name.size());
UniqueName.append_uint_32(++LastUnique);
// Try insert the vmap entry with this suffix.