#include "llvm/GlobalValue.h"
#include "llvm/Type.h"
#include "llvm/ValueSymbolTable.h"
-#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Debug.h"
using namespace llvm;
#endif
}
-// getUniqueName - Given a base name, return a string that is either equal to
-// it (or derived from it) that does not already occur in the symbol table for
-// the specified type.
-//
-std::string ValueSymbolTable::getUniqueName(const std::string &BaseName) const {
- std::string TryName = BaseName;
-
- // See if the name exists
- while (vmap.find(&TryName[0], &TryName[TryName.size()]) != vmap.end())
- // Loop until we find a free name in the symbol table.
- TryName = BaseName + utostr(++LastUnique);
- return TryName;
-}
-
-
// lookup a value - Returns null on failure...
//
Value *ValueSymbolTable::lookup(const std::string &Name) const {
- const_iterator VI = vmap.find(&Name[0], &Name[Name.size()]);
+ 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 {
- const_iterator VI = vmap.find(NameBegin, NameEnd);
+ // 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;
return;
}
- // FIXME: this could be much more efficient.
-
// Otherwise, there is a naming conflict. Rename this value.
- std::string UniqueName = V->getName();
-
+ SmallString<128> UniqueName(V->getNameStart(), V->getNameEnd());
+
+ // The name is too already used, just free it so we can allocate a new name.
V->Name->Destroy();
unsigned BaseSize = UniqueName.size();
while (1) {
// Trim any suffix off.
UniqueName.resize(BaseSize);
- UniqueName += utostr(++LastUnique);
+ UniqueName.append_uint_32(++LastUnique);
// Try insert the vmap entry with this suffix.
- ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0],
- &UniqueName[UniqueName.size()]);
+ ValueName &NewName =
+ vmap.GetOrCreateValue(StringRef(UniqueName.data(),
+ UniqueName.size()));
if (NewName.getValue() == 0) {
// Newly inserted name. Success!
NewName.setValue(V);
void ValueSymbolTable::removeValueName(ValueName *V) {
//DEBUG(DOUT << " Removing Value: " << V->getKeyData() << "\n");
- // Remove the value from the plane.
+ // Remove the value from the symbol table.
vmap.remove(V);
}
/// auto-renames the name and returns that instead.
ValueName *ValueSymbolTable::createValueName(const char *NameStart,
unsigned NameLen, Value *V) {
- ValueName &Entry = vmap.GetOrCreateValue(NameStart, NameStart+NameLen);
+ // In the common case, the name is not already in the symbol table.
+ ValueName &Entry = vmap.GetOrCreateValue(StringRef(NameStart, NameLen));
if (Entry.getValue() == 0) {
Entry.setValue(V);
//DEBUG(DOUT << " Inserted value: " << Entry.getKeyData() << ": "
return &Entry;
}
- // FIXME: this could be much more efficient.
-
// Otherwise, there is a naming conflict. Rename this value.
- std::string UniqueName(NameStart, NameStart+NameLen);
+ SmallString<128> UniqueName(NameStart, NameStart+NameLen);
+
while (1) {
// Trim any suffix off.
UniqueName.resize(NameLen);
- UniqueName += utostr(++LastUnique);
+ UniqueName.append_uint_32(++LastUnique);
+
// Try insert the vmap entry with this suffix.
- ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0],
- &UniqueName[UniqueName.size()]);
+ ValueName &NewName =
+ vmap.GetOrCreateValue(StringRef(UniqueName.data(),
+ UniqueName.size()));
if (NewName.getValue() == 0) {
// Newly inserted name. Success!
NewName.setValue(V);