6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-14 15:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Remove Value::setName(const char*, unsigned).

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77100 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2009-07-26 00:34:27 +00:00
parent d1319ef308
commit 3f53fa9a51
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Value.h
View File

@@ -128,8 +128,11 @@ public:
StringRef getName() const { return StringRef(getNameStart(), getNameLen()); } StringRef getName() const { return StringRef(getNameStart(), getNameLen()); }
std::string getNameStr() const; std::string getNameStr() const;
/// setName() - Change the name of the value, choosing a new unique name if
/// the provided name is taken.
///
/// \arg Name - The new name; or "" if the value's name should be removed.
void setName(const Twine &Name); void setName(const Twine &Name);
void setName(const char *Name, unsigned NameLen);
/// takeName - transfer the name from V to this value, setting V's name to /// takeName - transfer the name from V to this value, setting V's name to

4
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@@ -680,7 +680,7 @@ bool BitcodeReader::ParseValueSymbolTable() {
return Error("Invalid Value ID in VST_ENTRY record"); return Error("Invalid Value ID in VST_ENTRY record");
Value *V = ValueList[ValueID]; Value *V = ValueList[ValueID];
V->setName(&ValueName[0], ValueName.size()); V->setName(StringRef(ValueName.data(), ValueName.size()));
ValueName.clear(); ValueName.clear();
break; break;
} }
@@ -691,7 +691,7 @@ bool BitcodeReader::ParseValueSymbolTable() {
if (BB == 0) if (BB == 0)
return Error("Invalid BB ID in VST_BBENTRY record"); return Error("Invalid BB ID in VST_BBENTRY record");
BB->setName(&ValueName[0], ValueName.size()); BB->setName(StringRef(ValueName.data(), ValueName.size()));
ValueName.clear(); ValueName.clear();
break; break;
} }

14
lib/VMCore/Value.cpp
View File

@@ -170,13 +170,13 @@ std::string Value::getNameStr() const {
return getName().str(); return getName().str();
} }
void Value::setName(const Twine &Name) { void Value::setName(const Twine &NewName) {
SmallString<32> NameData; SmallString<32> NameData;
Name.toVector(NameData); NewName.toVector(NameData);
setName(NameData.begin(), NameData.size());
} const char *NameStr = NameData.data();
unsigned NameLen = NameData.size();
void Value::setName(const char *NameStr, unsigned NameLen) {
if (NameLen == 0 && !hasName()) return; if (NameLen == 0 && !hasName()) return;
assert(getType() != Type::VoidTy && "Cannot assign a name to void values!"); assert(getType() != Type::VoidTy && "Cannot assign a name to void values!");
@@ -242,7 +242,7 @@ void Value::takeName(Value *V) {
if (getSymTab(this, ST)) { if (getSymTab(this, ST)) {
// We can't set a name on this value, but we need to clear V's name if // We can't set a name on this value, but we need to clear V's name if
// it has one. // it has one.
if (V->hasName()) V->setName(0, 0); if (V->hasName()) V->setName("");
return; // Cannot set a name on this value (e.g. constant). return; // Cannot set a name on this value (e.g. constant).
} }
@@ -262,7 +262,7 @@ void Value::takeName(Value *V) {
if (!ST) { if (!ST) {
if (getSymTab(this, ST)) { if (getSymTab(this, ST)) {
// Clear V's name. // Clear V's name.
V->setName(0, 0); V->setName("");
return; // Cannot set a name on this value (e.g. constant). return; // Cannot set a name on this value (e.g. constant).
} }
} }

4
tools/bugpoint/ExtractFunction.cpp
View File

@@ -269,8 +269,8 @@ llvm::SplitFunctionsOutOfModule(Module *M,
I->setLinkage(GlobalValue::ExternalLinkage); I->setLinkage(GlobalValue::ExternalLinkage);
for (Module::global_iterator I = M->global_begin(), E = M->global_end(); for (Module::global_iterator I = M->global_begin(), E = M->global_end();
I != E; ++I) { I != E; ++I) {
if (I->hasName() && *I->getNameStart() == '\01') if (I->hasName() && I->getName()[0] == '\01')
I->setName(I->getNameStart()+1, I->getNameLen()-1); I->setName(I->getName().substr(1));
I->setLinkage(GlobalValue::ExternalLinkage); I->setLinkage(GlobalValue::ExternalLinkage);
} }