5 files changed, 23 insertions, 27 deletions

diff --git a/include/llvm/ADT/Twine.h b/include/llvm/ADT/Twine.h
index 29490b95b4..97e9df4458 100644
--- a/include/llvm/ADT/Twine.h
+++ b/include/llvm/ADT/Twine.h
@@ -375,8 +375,12 @@ namespace llvm {
       case StringRefKind:  return *(const StringRef*)LHS;
       }
     }
-    
-    
+
+    /// toStringRef - This returns the twine as a single StringRef if it can be
+    /// represented as such. Otherwise the twine is written into the given
+    /// SmallVector and a StringRef to the SmallVector's data is returned.
+    StringRef toStringRef(SmallVectorImpl<char> &Out) const;
+
     /// print - Write the concatenated string represented by this twine to the
     /// stream \arg OS.
     void print(raw_ostream &OS) const;
diff --git a/lib/Support/Twine.cpp b/lib/Support/Twine.cpp
index 94464ffe4f..21504e964e 100644
--- a/lib/Support/Twine.cpp
+++ b/lib/Support/Twine.cpp
@@ -15,8 +15,7 @@ using namespace llvm;
 
 std::string Twine::str() const {
   SmallString<256> Vec;
-  toVector(Vec);
-  return std::string(Vec.begin(), Vec.end());
+  return toStringRef(Vec).str();
 }
 
 void Twine::toVector(SmallVectorImpl<char> &Out) const {
@@ -24,6 +23,13 @@ void Twine::toVector(SmallVectorImpl<char> &Out) const {
   print(OS);
 }
 
+StringRef Twine::toStringRef(SmallVectorImpl<char> &Out) const {
+  if (isSingleStringRef())
+    return getSingleStringRef();
+  toVector(Out);
+  return StringRef(Out.data(), Out.size());
+}
+
 void Twine::printOneChild(raw_ostream &OS, const void *Ptr, 
                           NodeKind Kind) const {
   switch (Kind) {
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 69a24a0bc2..7d9f330f4c 100644
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -41,8 +41,7 @@ void Mangler::makeNameProper(SmallVectorImpl<char> &OutName,
                              const Twine &TheName,
                              ManglerPrefixTy PrefixTy) {
   SmallString<256> TmpData;
-  TheName.toVector(TmpData);
-  StringRef X = TmpData.str();
+  StringRef X = TheName.toStringRef(TmpData);
   assert(!X.empty() && "Cannot mangle empty strings");
   
   if (!UseQuotes) {
@@ -188,13 +187,7 @@ std::string Mangler::getMangledName(const GlobalValue *GV, const char *Suffix,
 void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName,
                                 const Twine &GVName, ManglerPrefixTy PrefixTy) {
   SmallString<256> TmpData;
-  StringRef Name;
-  if (GVName.isSingleStringRef())
-    Name = GVName.getSingleStringRef();
-  else {
-    GVName.toVector(TmpData);
-    Name = TmpData.str();
-  }
+  StringRef Name = GVName.toStringRef(TmpData);
   assert(!Name.empty() && "getNameWithPrefix requires non-empty name");
   
   // If the global name is not led with \1, add the appropriate prefixes.
diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp
index e6a962bbca..bac89bfd7b 100644
--- a/lib/VMCore/Metadata.cpp
+++ b/lib/VMCore/Metadata.cpp
@@ -327,12 +327,8 @@ void NamedMDNode::setName(const Twine &NewName) {
   assert (!NewName.isTriviallyEmpty() && "Invalid named metadata name!");
 
   SmallString<256> NameData;
-  NewName.toVector(NameData);
+  StringRef NameRef = NewName.toStringRef(NameData);
 
-  const char *NameStr = NameData.data();
-  unsigned NameLen = NameData.size();
-
-  StringRef NameRef = StringRef(NameStr, NameLen);
   // Name isn't changing?
   if (getName() == NameRef)
     return;
diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index ecf2d4b774..40679bfc29 100644
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -170,13 +170,10 @@ void Value::setName(const Twine &NewName) {
     return;
 
   SmallString<256> NameData;
-  NewName.toVector(NameData);
-
-  const char *NameStr = NameData.data();
-  unsigned NameLen = NameData.size();
+  StringRef NameRef = NewName.toStringRef(NameData);
 
   // Name isn't changing?
-  if (getName() == StringRef(NameStr, NameLen))
+  if (getName() == NameRef)
     return;
 
   assert(!getType()->isVoidTy() && "Cannot assign a name to void values!");
@@ -187,7 +184,7 @@ void Value::setName(const Twine &NewName) {
     return;  // Cannot set a name on this value (e.g. constant).
 
   if (!ST) { // No symbol table to update?  Just do the change.
-    if (NameLen == 0) {
+    if (NameRef.empty()) {
       // Free the name for this value.
       Name->Destroy();
       Name = 0;
@@ -201,7 +198,7 @@ void Value::setName(const Twine &NewName) {
     // then reallocated.
 
     // Create the new name.
-    Name = ValueName::Create(NameStr, NameStr+NameLen);
+    Name = ValueName::Create(NameRef.begin(), NameRef.end());
     Name->setValue(this);
     return;
   }
@@ -214,12 +211,12 @@ void Value::setName(const Twine &NewName) {
     Name->Destroy();
     Name = 0;
 
-    if (NameLen == 0)
+    if (NameRef.empty())
       return;
   }
 
   // Name is changing to something new.
-  Name = ST->createValueName(StringRef(NameStr, NameLen), this);
+  Name = ST->createValueName(NameRef, this);
 }