<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 3, 2014 at 5:30 PM, Michael J. Spencer <span dir="ltr"><<a href="mailto:bigcheesegs@gmail.com" target="_blank">bigcheesegs@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mspencer<br>
Date: Mon Nov  3 19:30:55 2014<br>
New Revision: 221222<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=221222&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=221222&view=rev</a><br>
Log:<br>
[llvm-api-change] Use findProgramByName.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Driver/Driver.cpp<br>
    cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp<br>
    cfe/trunk/tools/driver/driver.cpp<br>
<br>
Modified: cfe/trunk/lib/Driver/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=221222&r1=221221&r2=221222&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=221222&r1=221221&r2=221222&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/Driver.cpp (original)<br>
+++ cfe/trunk/lib/Driver/Driver.cpp Mon Nov  3 19:30:55 2014<br>
@@ -1885,9 +1885,9 @@ std::string Driver::GetProgramPath(const<br>
<br>
   // If all else failed, search the path.<br>
   for (const auto &TargetSpecificExecutable : TargetSpecificExecutables) {<br>
-    std::string P(llvm::sys::FindProgramByName(TargetSpecificExecutable));<br>
-    if (!P.empty())<br>
-      return P;<br>
+    auto P = llvm::sys::findProgramByName(TargetSpecificExecutable);<br>
+    if (P)<br></blockquote><div><br>You could roll the declaration of 'P' into the if's condition.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+      return *P;<br>
   }<br>
<br>
   return Name;<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp?rev=221222&r1=221221&r2=221222&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp?rev=221222&r1=221221&r2=221222&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp Mon Nov  3 19:30:55 2014<br>
@@ -788,7 +788,9 @@ UbigraphViz::~UbigraphViz() {<br>
   Out.reset();<br>
   llvm::errs() << "Running 'ubiviz' program... ";<br>
   std::string ErrMsg;<br>
-  std::string Ubiviz = llvm::sys::FindProgramByName("ubiviz");<br>
+  std::string Ubiviz;<br>
+  if (auto Path = llvm::sys::findProgramByName("ubiviz"))<br>
+    Ubiviz = *Path;<br>
   std::vector<const char*> args;<br>
   args.push_back(Ubiviz.c_str());<br>
   args.push_back(Filename.c_str());<br>
<br>
Modified: cfe/trunk/tools/driver/driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=221222&r1=221221&r2=221222&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=221222&r1=221221&r2=221222&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/driver/driver.cpp (original)<br>
+++ cfe/trunk/tools/driver/driver.cpp Mon Nov  3 19:30:55 2014<br>
@@ -354,10 +354,10 @@ static void SetInstallDir(SmallVectorImp<br>
<br>
   // Do a PATH lookup, if there are no directory components.<br>
   if (llvm::sys::path::filename(InstalledPath) == InstalledPath) {<br>
-    std::string Tmp = llvm::sys::FindProgramByName(<br>
+    auto Tmp = llvm::sys::findProgramByName(<br>
       llvm::sys::path::filename(InstalledPath.str()));<br>
-    if (!Tmp.empty())<br>
-      InstalledPath = Tmp;<br>
+    if (Tmp)<br></blockquote><div><br></div><div>Similarly here.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+      InstalledPath = *Tmp;<br>
   }<br>
   llvm::sys::fs::make_absolute(InstalledPath);<br>
   InstalledPath = llvm::sys::path::parent_path(InstalledPath);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>