From: Hans Wennborg Date: Thu, 12 Sep 2013 18:35:08 +0000 (+0000) Subject: Move the execution code from Compilation::ExecuteCommand to Command::Execute X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaaa2a1889fe882e7e41048e3b298ca594454eb1;p=clang Move the execution code from Compilation::ExecuteCommand to Command::Execute I think it makes sense that a Command knows how to execute itself. There's no functionality change but i rewrote the code to avoid the manual memory management of Argv. My motivation for this is that I plan to subclass Command to build fall-back functionality into clang-cl. Differential Revision: http://llvm-reviews.chandlerc.com/D1654 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190621 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Driver/Job.h b/include/clang/Driver/Job.h index 17f0784bf3..161fda19b2 100644 --- a/include/clang/Driver/Job.h +++ b/include/clang/Driver/Job.h @@ -76,14 +76,15 @@ public: virtual void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote, bool CrashReport = false) const; + int Execute(const StringRef **Redirects, std::string *ErrMsg, + bool *ExecutionFailed) const; + /// getSource - Return the Action which caused the creation of this job. const Action &getSource() const { return Source; } /// getCreator - Return the Tool which caused the creation of this job. const Tool &getCreator() const { return Creator; } - const char *getExecutable() const { return Executable; } - const llvm::opt::ArgStringList &getArguments() const { return Arguments; } static bool classof(const Job *J) { diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index 5e7babef0d..f077fd68cc 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -16,7 +16,6 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/Program.h" #include "llvm/Support/raw_ostream.h" #include #include @@ -129,12 +128,6 @@ bool Compilation::CleanupFileMap(const ArgStringMap &Files, int Compilation::ExecuteCommand(const Command &C, const Command *&FailingCommand) const { - std::string Prog(C.getExecutable()); - const char **Argv = new const char*[C.getArguments().size() + 2]; - Argv[0] = C.getExecutable(); - std::copy(C.getArguments().begin(), C.getArguments().end(), Argv+1); - Argv[C.getArguments().size() + 1] = 0; - if ((getDriver().CCPrintOptions || getArgs().hasArg(options::OPT_v)) && !getDriver().CCGenDiagnostics) { raw_ostream *OS = &llvm::errs(); @@ -165,9 +158,7 @@ int Compilation::ExecuteCommand(const Command &C, std::string Error; bool ExecutionFailed; - int Res = llvm::sys::ExecuteAndWait(Prog, Argv, /*env*/ 0, Redirects, - /*secondsToWait*/ 0, /*memoryLimit*/ 0, - &Error, &ExecutionFailed); + int Res = C.Execute(Redirects, &Error, &ExecutionFailed); if (!Error.empty()) { assert(Res && "Error string set with 0 result code!"); getDriver().Diag(clang::diag::err_drv_command_failure) << Error; @@ -176,7 +167,6 @@ int Compilation::ExecuteCommand(const Command &C, if (Res) FailingCommand = &C; - delete[] Argv; return ExecutionFailed ? 1 : Res; } diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp index 116fbd0541..0a783eb93b 100644 --- a/lib/Driver/Job.cpp +++ b/lib/Driver/Job.cpp @@ -11,6 +11,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" +#include "llvm/Support/Program.h" #include "llvm/Support/raw_ostream.h" #include using namespace clang::driver; @@ -112,6 +113,19 @@ void Command::Print(raw_ostream &OS, const char *Terminator, bool Quote, OS << Terminator; } +int Command::Execute(const llvm::StringRef **Redirects, std::string *ErrMsg, + bool *ExecutionFailed) const { + SmallVector Argv; + Argv.push_back(Executable); + for (size_t i = 0, e = Arguments.size(); i != e; ++i) + Argv.push_back(Arguments[i]); + Argv.push_back(0); + + return llvm::sys::ExecuteAndWait(Executable, Argv.data(), /*env*/ 0, + Redirects, /*secondsToWait*/ 0, + /*memoryLimit*/ 0, ErrMsg, ExecutionFailed); +} + JobList::JobList() : Job(JobListClass) {} JobList::~JobList() {