Merging r257947:

------------------------------------------------------------------------ r257947 | joerg | 2016-01-15 14:29:34 -0800 (Fri, 15 Jan 2016) | 2 lines Avoid self-assignment of SmallString, trigger UB behavior down the road. ------------------------------------------------------------------------ llvm-svn: 258715
llvm · Jan 25, 2016 · 0c94351 · 0c94351
1 parent cc2b411
commit 0c94351
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
@@ -290,9 +290,9 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,
   if (CanonicalPrefixes)
     llvm::sys::fs::make_absolute(InstalledPath);
 
-  InstalledPath = llvm::sys::path::parent_path(InstalledPath);
-  if (llvm::sys::fs::exists(InstalledPath.c_str()))
-    TheDriver.setInstalledDir(InstalledPath);
+  StringRef InstalledPathParent(llvm::sys::path::parent_path(InstalledPath));
+  if (llvm::sys::fs::exists(InstalledPathParent))
+    TheDriver.setInstalledDir(InstalledPathParent);
 }
 
 static int ExecuteCC1Tool(ArrayRef<const char *> argv, StringRef Tool) {