diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
index 1947bac99b50..fb7c6cc7b032 100644
--- a/clang/tools/driver/driver.cpp
+++ b/clang/tools/driver/driver.cpp
@@ -202,8 +202,9 @@ int main(int argc, const char **argv) {
   //
   // Note that we intentionally want to use argv[0] here, to support "clang++"
   // being a symlink.
-  llvm::StringRef ProgName(llvm::sys::Path(argv[0]).getBasename());
-  if (ProgName.endswith("++") || ProgName.rsplit('-').first.endswith("++"))
+  std::string ProgName(llvm::sys::Path(argv[0]).getBasename());
+  if (llvm::StringRef(ProgName).endswith("++") ||
+      llvm::StringRef(ProgName).rsplit('-').first.endswith("++"))
     TheDriver.CCCIsCXX = true;
 
   llvm::OwningPtr<Compilation> C;