From: Martell Malone <martellmalone@gmail.com>
Date: Sat, 20 May 2017 21:00:36 +0000 (+0000)
Subject: COFF: Fix single StringRef return error
X-Git-Tag: llvmorg-5.0.0-rc1~4658
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1a5d9eee5c85ad93564b6f801026a00ac4f5346;p=platform%2Fupstream%2Fllvm.git

COFF: Fix single StringRef return error

This should appease the lld build bot regression
Intrroduced by rL303490

llvm-svn: 303493
---

diff --git a/llvm/lib/Object/COFFImportFile.cpp b/llvm/lib/Object/COFFImportFile.cpp
index d4890fe..37962d8 100644
--- a/llvm/lib/Object/COFFImportFile.cpp
+++ b/llvm/lib/Object/COFFImportFile.cpp
@@ -111,8 +111,8 @@ static Expected<std::string> replace(StringRef S, StringRef From,
 
   if (Pos == StringRef::npos) {
     return make_error<StringError>(
-      Twine(S + ": replacing '" + From + "' with '" + To + "' failed")
-      .getSingleStringRef(), object_error::parse_failed);
+      StringRef(Twine(S + ": replacing '" + From +
+        "' with '" + To + "' failed").str()), object_error::parse_failed);
   }
 
   return (Twine(S.substr(0, Pos)) + To + S.substr(Pos + From.size())).str();