3 files changed, 9 insertions, 7 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index ccb6a4861ec..b8b235c9368 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1885,9 +1885,9 @@ std::string Driver::GetProgramPath(const char *Name,
 
   // If all else failed, search the path.
   for (const auto &TargetSpecificExecutable : TargetSpecificExecutables) {
-    std::string P(llvm::sys::FindProgramByName(TargetSpecificExecutable));
-    if (!P.empty())
-      return P;
+    auto P = llvm::sys::findProgramByName(TargetSpecificExecutable);
+    if (P)
+      return *P;
   }
 
   return Name;
diff --git a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
index ca047a966b9..7e4a7b5ce90 100644
--- a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
+++ b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
@@ -788,7 +788,9 @@ UbigraphViz::~UbigraphViz() {
   Out.reset();
   llvm::errs() << "Running 'ubiviz' program... ";
   std::string ErrMsg;
-  std::string Ubiviz = llvm::sys::FindProgramByName("ubiviz");
+  std::string Ubiviz;
+  if (auto Path = llvm::sys::findProgramByName("ubiviz"))
+    Ubiviz = *Path;
   std::vector<const char*> args;
   args.push_back(Ubiviz.c_str());
   args.push_back(Filename.c_str());
diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
index 5a3fed6d984..50427da460b 100644
--- a/clang/tools/driver/driver.cpp
+++ b/clang/tools/driver/driver.cpp
@@ -354,10 +354,10 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,
 
   // Do a PATH lookup, if there are no directory components.
   if (llvm::sys::path::filename(InstalledPath) == InstalledPath) {
-    std::string Tmp = llvm::sys::FindProgramByName(
+    auto Tmp = llvm::sys::findProgramByName(
       llvm::sys::path::filename(InstalledPath.str()));
-    if (!Tmp.empty())
-      InstalledPath = Tmp;
+    if (Tmp)
+      InstalledPath = *Tmp;
   }
   llvm::sys::fs::make_absolute(InstalledPath);
   InstalledPath = llvm::sys::path::parent_path(InstalledPath);