Integrate module gen/programs into driver/tool

driver/linker.cpp

@@ -19,7 +19,6 @@
 #include "gen/llvm.h"
 #include "gen/logger.h"
 #include "gen/optimizer.h"
-#include "gen/programs.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Linker/Linker.h"

driver/toobj.cpp

@@ -16,7 +16,6 @@
 #include "gen/irstate.h"
 #include "gen/logger.h"
 #include "gen/optimizer.h"
-#include "gen/programs.h"
 #include "llvm/IR/AssemblyAnnotationWriter.h"
 #include "llvm/IR/Verifier.h"
 #if LDC_LLVM_VER >= 309

driver/tool.cpp

@@ -10,6 +10,7 @@
 #include "driver/tool.h"
 #include "mars.h"
 #include "driver/exe_path.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -18,16 +19,79 @@
 #include <Windows.h>
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+
+static llvm::cl::opt<std::string>
+    gcc("gcc", llvm::cl::desc("GCC to use for assembling and linking"),
+        llvm::cl::Hidden, llvm::cl::ZeroOrMore);
+
+static llvm::cl::opt<std::string> ar("ar", llvm::cl::desc("Archiver"),
+                                     llvm::cl::Hidden, llvm::cl::ZeroOrMore);
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace {
+
+std::string findProgramByName(llvm::StringRef name) {
+#if LDC_LLVM_VER >= 306
+  llvm::ErrorOr<std::string> res = llvm::sys::findProgramByName(name);
+  return res ? res.get() : std::string();
+#else
+  return llvm::sys::FindProgramByName(name);
+#endif
+}
+
+std::string getProgram(const char *name,
+                       const llvm::cl::opt<std::string> *opt = nullptr,
+                       const char *envVar = nullptr) {
+  std::string path;
+  const char *prog = nullptr;
+
+  if (opt && !opt->empty()) {
+    path = findProgramByName(opt->c_str());
+  }
+
+  if (path.empty() && envVar && (prog = getenv(envVar)) && prog[0] != '\0') {
+    path = findProgramByName(prog);
+  }
+
+  if (path.empty()) {
+    path = findProgramByName(name);
+  }
+
+  if (path.empty()) {
+    error(Loc(), "failed to locate %s", name);
+    fatal();
+  }
+
+  return path;
+}
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+std::string getGcc() {
+#if defined(__FreeBSD__) && __FreeBSD__ >= 10
+  // Default compiler on FreeBSD 10 is clang
+  return getProgram("clang", &gcc, "CC");
+#else
+  return getProgram("gcc", &gcc, "CC");
+#endif
+}
+
+std::string getArchiver() { return getProgram("ar", &ar); }
+
+////////////////////////////////////////////////////////////////////////////////
+
 int executeToolAndWait(const std::string &tool_,
                        std::vector<std::string> const &args, bool verbose) {
-  auto fullToolOrError = llvm::sys::findProgramByName(tool_);
+  const auto tool = findProgramByName(tool_);
-  if (fullToolOrError.getError()) {
+  if (tool.empty()) {
     error(Loc(), "failed to locate binary %s", tool_.c_str());
     return -1;
   }
 
-  const auto tool = std::move(*fullToolOrError);
-
   // Construct real argument list.
   // First entry is the tool itself, last entry must be NULL.
   std::vector<const char *> realargs;
@@ -61,7 +125,7 @@ int executeToolAndWait(const std::string &tool_,
   return 0;
 }
 
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 #ifdef _WIN32
 
@@ -139,8 +203,8 @@ int executeAndWait(const char *commandLine) {
 #endif
   // according to MSDN, only CreateProcessW (unicode) may modify the passed
   // command line
-  if (!CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0,
+  if (!CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si,
-                     NULL, NULL, &si, &pi)) {
+                     &pi)) {
     exitCode = -1;
   } else {
     if (WaitForSingleObject(pi.hProcess, INFINITE) != 0 ||

driver/tool.h

@@ -18,6 +18,9 @@
 #include <vector>
 #include <string>
 
+std::string getGcc();
+std::string getArchiver();
+
 int executeToolAndWait(const std::string &tool,
                        std::vector<std::string> const &args,
                        bool verbose = false);

gen/modules.cpp

@@ -31,7 +31,6 @@
 #include "gen/logger.h"
 #include "gen/moduleinfo.h"
 #include "gen/optimizer.h"
-#include "gen/programs.h"
 #include "gen/runtime.h"
 #include "gen/structs.h"
 #include "gen/tollvm.h"

gen/programs.cpp

@@ -1,71 +0,0 @@
-//===-- programs.cpp ------------------------------------------------------===//
-//
-//                         LDC – the LLVM D compiler
-//
-// This file is distributed under the BSD-style LDC license. See the LICENSE
-// file for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "gen/programs.h"
-#include "mars.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Program.h"
-
-using namespace llvm;
-
-static cl::opt<std::string>
-    gcc("gcc", cl::desc("GCC to use for assembling and linking"), cl::Hidden,
-        cl::ZeroOrMore);
-
-static cl::opt<std::string> ar("ar", cl::desc("Archiver"), cl::Hidden,
-                               cl::ZeroOrMore);
-
-static std::string findProgramByName(llvm::StringRef name) {
-#if LDC_LLVM_VER >= 306
-  llvm::ErrorOr<std::string> res = llvm::sys::findProgramByName(name);
-  return res ? res.get() : std::string();
-#else
-  return llvm::sys::FindProgramByName(name);
-#endif
-}
-
-static std::string getProgram(const char *name, const cl::opt<std::string> *opt,
-                              const char *envVar = nullptr) {
-  std::string path;
-  const char *prog = nullptr;
-
-  if (opt && !opt->empty()) {
-    path = findProgramByName(opt->c_str());
-  }
-
-  if (path.empty() && envVar && (prog = getenv(envVar)) && prog[0] != '\0') {
-    path = findProgramByName(prog);
-  }
-
-  if (path.empty()) {
-    path = findProgramByName(name);
-  }
-
-  if (path.empty()) {
-    error(Loc(), "failed to locate %s", name);
-    fatal();
-  }
-
-  return path;
-}
-
-std::string getProgram(const char *name, const char *envVar) {
-  return getProgram(name, nullptr, envVar);
-}
-
-std::string getGcc() {
-#if defined(__FreeBSD__) && __FreeBSD__ >= 10
-  // Default compiler on FreeBSD 10 is clang
-  return getProgram("clang", &gcc, "CC");
-#else
-  return getProgram("gcc", &gcc, "CC");
-#endif
-}
-
-std::string getArchiver() { return getProgram("ar", &ar); }

gen/programs.h

@@ -1,24 +0,0 @@
-//===-- gen/programs.h - External tool discovery ----------------*- C++ -*-===//
-//
-//                         LDC – the LLVM D compiler
-//
-// This file is distributed under the BSD-style LDC license. See the LICENSE
-// file for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Functions for discovering the external tools used for linking, etc.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LDC_GEN_PROGRAMS_H
-#define LDC_GEN_PROGRAMS_H
-
-#include <string>
-
-std::string getProgram(const char *name, const char *envVar = nullptr);
-
-std::string getGcc();
-std::string getArchiver();
-
-#endif