Fix style.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221546 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index f827aaf166fe8cd7ff630d092d7d79f1fb23fd8e..1794e8e7070a81c6bba306c0a423208ece454f36 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1885,11 +1885,10 @@ std::string Driver::GetProgramPath(const char *Name,
   }
 
   // If all else failed, search the path.
-  for (const auto &TargetSpecificExecutable : TargetSpecificExecutables) {
-    auto P = llvm::sys::findProgramByName(TargetSpecificExecutable);
-    if (P)
+  for (const auto &TargetSpecificExecutable : TargetSpecificExecutables)
+    if (llvm::ErrorOr<std::string> P =
+            llvm::sys::findProgramByName(TargetSpecificExecutable))
       return *P;
-  }
 
   return Name;
 }

diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 50427da460bf82a1f8792aa3d9b151c02cc5cbc3..57db0261a7b4489d0b35aa0c55da82c30d048cf4 100644 (file)
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -353,12 +353,10 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,
   SmallString<128> InstalledPath(argv[0]);
 
   // Do a PATH lookup, if there are no directory components.
-  if (llvm::sys::path::filename(InstalledPath) == InstalledPath) {
-    auto Tmp = llvm::sys::findProgramByName(
-      llvm::sys::path::filename(InstalledPath.str()));
-    if (Tmp)
+  if (llvm::sys::path::filename(InstalledPath) == InstalledPath)
+    if (llvm::ErrorOr<std::string> Tmp = llvm::sys::findProgramByName(
+            llvm::sys::path::filename(InstalledPath.str())))
       InstalledPath = *Tmp;
-  }
   llvm::sys::fs::make_absolute(InstalledPath);
   InstalledPath = llvm::sys::path::parent_path(InstalledPath);
   if (llvm::sys::fs::exists(InstalledPath.c_str()))