aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Bitcode/Reader/BitcodeReader.cpp4
-rw-r--r--lib/VMCore/Value.cpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 7a22402..0c6162c 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -680,7 +680,7 @@ bool BitcodeReader::ParseValueSymbolTable() {
return Error("Invalid Value ID in VST_ENTRY record");
Value *V = ValueList[ValueID];
- V->setName(&ValueName[0], ValueName.size());
+ V->setName(StringRef(ValueName.data(), ValueName.size()));
ValueName.clear();
break;
}
@@ -691,7 +691,7 @@ bool BitcodeReader::ParseValueSymbolTable() {
if (BB == 0)
return Error("Invalid BB ID in VST_BBENTRY record");
- BB->setName(&ValueName[0], ValueName.size());
+ BB->setName(StringRef(ValueName.data(), ValueName.size()));
ValueName.clear();
break;
}
diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index 1b9fe51..6157dd5 100644
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -170,13 +170,13 @@ std::string Value::getNameStr() const {
return getName().str();
}
-void Value::setName(const Twine &Name) {
+void Value::setName(const Twine &NewName) {
SmallString<32> NameData;
- Name.toVector(NameData);
- setName(NameData.begin(), NameData.size());
-}
+ NewName.toVector(NameData);
+
+ const char *NameStr = NameData.data();
+ unsigned NameLen = NameData.size();
-void Value::setName(const char *NameStr, unsigned NameLen) {
if (NameLen == 0 && !hasName()) return;
assert(getType() != Type::VoidTy && "Cannot assign a name to void values!");
@@ -242,7 +242,7 @@ void Value::takeName(Value *V) {
if (getSymTab(this, ST)) {
// We can't set a name on this value, but we need to clear V's name if
// 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).
}
@@ -262,7 +262,7 @@ void Value::takeName(Value *V) {
if (!ST) {
if (getSymTab(this, ST)) {
// Clear V's name.
- V->setName(0, 0);
+ V->setName("");
return; // Cannot set a name on this value (e.g. constant).
}
}