From: Michael J. Spencer <bigcheesegs@gmail.com>
Date: Fri, 7 Nov 2014 21:30:36 +0000 (+0000)
Subject: Fix style.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=049368273b23af8419d3c306e25232ac157e549b;p=oota-llvm.git

Fix style.

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

diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 3910b12da89..054df528474 100644
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -105,8 +105,7 @@ struct GraphSession {
     SmallVector<StringRef, 8> parts;
     Names.split(parts, "|");
     for (auto Name : parts) {
-      auto P = sys::findProgramByName(Name);
-      if (P) {
+      if (ErrorOr<std::string> P = sys::findProgramByName(Name)) {
         ProgramPath = *P;
         return true;
       }
diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp
index 752fc8950e5..f197cc53926 100644
--- a/tools/bugpoint/OptimizerDriver.cpp
+++ b/tools/bugpoint/OptimizerDriver.cpp
@@ -161,11 +161,10 @@ bool BugDriver::runPasses(Module *Program,
 
   std::string tool = OptCmd;
   if (OptCmd.empty()) {
-    auto Path = sys::findProgramByName("opt");
-    if (!Path)
-      errs() << Path.getError().message() << "\n";
-    else
+    if (ErrorOr<std::string> Path = sys::findProgramByName("opt"))
       tool = *Path;
+    else
+      errs() << Path.getError().message() << "\n";
   }
   if (tool.empty()) {
     errs() << "Cannot find `opt' in PATH!\n";
@@ -174,11 +173,10 @@ bool BugDriver::runPasses(Module *Program,
 
   std::string Prog;
   if (UseValgrind) {
-    auto Path = sys::findProgramByName("valgrind");
-    if (!Path)
-      errs() << Path.getError().message() << "\n";
-    else
+    if (ErrorOr<std::string> Path = sys::findProgramByName("valgrind"))
       Prog = *Path;
+    else
+      errs() << Path.getError().message() << "\n";
   } else
     Prog = tool;
   if (Prog.empty()) {