diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Support/GraphWriter.cpp | 3 | ||||
| -rw-r--r-- | llvm/tools/bugpoint/OptimizerDriver.cpp | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/llvm/lib/Support/GraphWriter.cpp b/llvm/lib/Support/GraphWriter.cpp index 3910b12da89..054df528474 100644 --- a/llvm/lib/Support/GraphWriter.cpp +++ b/llvm/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/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp index 752fc8950e5..f197cc53926 100644 --- a/llvm/tools/bugpoint/OptimizerDriver.cpp +++ b/llvm/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()) { |
