Rename FindExecutable to PrependMainExecutablePath.

Makes it more clear that it is just a path manipulation function.

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

include/llvm/Support/SystemUtils.h

@@ -30,12 +30,13 @@ bool CheckBitcodeOutputToConsole(
   bool print_warning = true     ///< Control whether warnings are printed
 );
 
-/// FindExecutable - Find a named executable, given the value of argv[0] of the
+/// PrependMainExecutablePath - Prepend the path to the program being executed
-/// program being executed and the address of main itself. This allows us to
+/// to \p ExeName, given the value of argv[0] and the address of main()
-/// find another LLVM tool if it is built in the same directory. An empty string
+/// itself. This allows us to find another LLVM tool if it is built in the same
-/// is returned on error.
+/// directory. An empty string is returned on error; note that this function
+/// just mainpulates the path and doesn't check for executability.
 /// @brief Find a named executable.
-sys::Path FindExecutable(const std::string &ExeName,
+sys::Path PrependMainExecutablePath(const std::string &ExeName,
                                     const char *Argv0, void *MainAddr);
 
 } // End llvm namespace

lib/CompilerDriver/Action.cpp

@@ -57,7 +57,8 @@ namespace {
     sys::Path prog(name);
 
     if (!prog.isAbsolute()) {
-      prog = FindExecutable(name, ProgramName, (void *)(intptr_t)&Main);
+      prog = PrependMainExecutablePath(name, ProgramName,
+                                       (void *)(intptr_t)&Main);
 
       if (!prog.canExecute()) {
         prog = sys::Program::FindProgramByName(name);

lib/Support/SystemUtils.cpp

@@ -32,12 +32,13 @@ bool llvm::CheckBitcodeOutputToConsole(raw_ostream &stream_to_check,
   return false;
 }
 
-/// FindExecutable - Find a named executable, given the value of argv[0] of the
+/// PrependMainExecutablePath - Prepend the path to the program being executed
-/// program being executed and the address of main itself. This allows us to
+/// to \p ExeName, given the value of argv[0] and the address of main()
-/// find another LLVM tool if it is built in the same directory. An empty string
+/// itself. This allows us to find another LLVM tool if it is built in the same
-/// is returned on error.
+/// directory. An empty string is returned on error; note that this function
-#undef FindExecutable   // needed on windows :(
+/// just mainpulates the path and doesn't check for executability.
-sys::Path llvm::FindExecutable(const std::string &ExeName,
+/// @brief Find a named executable.
+sys::Path llvm::PrependMainExecutablePath(const std::string &ExeName,
                                           const char *Argv0, void *MainAddr) {
   // Check the directory that the calling program is in.  We can do
   // this if ProgramPath contains at least one / character, indicating that it

tools/bugpoint/OptimizerDriver.cpp

@@ -144,7 +144,8 @@ bool BugDriver::runPasses(Module *Program,
     return 1;
   }
 
-  sys::Path tool = FindExecutable("opt", getToolName(), (void*)"opt");
+  sys::Path tool = PrependMainExecutablePath("opt", getToolName(),
+                                             (void*)"opt");
   if (tool.empty()) {
     errs() << "Cannot find `opt' in executable directory!\n";
     return 1;

tools/bugpoint/ToolRunner.cpp

@@ -238,7 +238,7 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const char *Argv0,
                                                     std::string &Message,
                                      const std::vector<std::string> *ToolArgs) {
   std::string LLIPath =
-    FindExecutable("lli", Argv0, (void *)(intptr_t)&createLLI).str();
+    PrependMainExecutablePath("lli", Argv0, (void *)(intptr_t)&createLLI).str();
   if (!LLIPath.empty()) {
     Message = "Found lli: " + LLIPath + "\n";
     return new LLI(LLIPath, ToolArgs);
@@ -438,7 +438,7 @@ LLC *AbstractInterpreter::createLLC(const char *Argv0,
                                     const std::vector<std::string> *GCCArgs,
                                     bool UseIntegratedAssembler) {
   std::string LLCPath =
-    FindExecutable("llc", Argv0, (void *)(intptr_t)&createLLC).str();
+    PrependMainExecutablePath("llc", Argv0, (void *)(intptr_t)&createLLC).str();
   if (LLCPath.empty()) {
     Message = "Cannot find `llc' in executable directory!\n";
     return 0;
@@ -526,7 +526,7 @@ int JIT::ExecuteProgram(const std::string &Bitcode,
 AbstractInterpreter *AbstractInterpreter::createJIT(const char *Argv0,
                    std::string &Message, const std::vector<std::string> *Args) {
   std::string LLIPath =
-    FindExecutable("lli", Argv0, (void *)(intptr_t)&createJIT).str();
+    PrependMainExecutablePath("lli", Argv0, (void *)(intptr_t)&createJIT).str();
   if (!LLIPath.empty()) {
     Message = "Found lli: " + LLIPath + "\n";
     return new JIT(LLIPath, Args);
@@ -608,7 +608,7 @@ CBE *AbstractInterpreter::createCBE(const char *Argv0,
                                     const std::vector<std::string> *Args,
                                     const std::vector<std::string> *GCCArgs) {
   sys::Path LLCPath =
-    FindExecutable("llc", Argv0, (void *)(intptr_t)&createCBE);
+    PrependMainExecutablePath("llc", Argv0, (void *)(intptr_t)&createCBE);
   if (LLCPath.isEmpty()) {
     Message =
       "Cannot find `llc' in executable directory!\n";

tools/llvm-ld/llvm-ld.cpp

@@ -415,7 +415,7 @@ static void EmitShellScript(char **argv, Module *M) {
   // support windows systems, we copy the llvm-stub.exe executable from the
   // build tree to the destination file.
   std::string ErrMsg;
-  sys::Path llvmstub = FindExecutable("llvm-stub.exe", argv[0],
+  sys::Path llvmstub = PrependMainExecutablePath("llvm-stub", argv[0],
                                                  (void *)(intptr_t)&Optimize);
   if (llvmstub.isEmpty())
     PrintAndExit("Could not find llvm-stub.exe executable!", M);
@@ -664,7 +664,7 @@ int main(int argc, char **argv, char **envp) {
       sys::RemoveFileOnSignal(AssemblyFile);
 
       // Determine the locations of the llc and gcc programs.
-      sys::Path llc = FindExecutable("llc", argv[0],
+      sys::Path llc = PrependMainExecutablePath("llc", argv[0],
                                                 (void *)(intptr_t)&Optimize);
       if (llc.isEmpty())
         PrintAndExit("Failed to find llc", Composite.get());
@@ -691,7 +691,7 @@ int main(int argc, char **argv, char **envp) {
       sys::RemoveFileOnSignal(CFile);
 
       // Determine the locations of the llc and gcc programs.
-      sys::Path llc = FindExecutable("llc", argv[0],
+      sys::Path llc = PrependMainExecutablePath("llc", argv[0],
                                                 (void *)(intptr_t)&Optimize);
       if (llc.isEmpty())
         PrintAndExit("Failed to find llc", Composite.get());