diff options
| -rw-r--r-- | include/clang/Driver/Compilation.h | 12 | ||||
| -rw-r--r-- | include/clang/Driver/Driver.h | 8 | ||||
| -rw-r--r-- | lib/Driver/Compilation.cpp | 48 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 48 | ||||
| -rw-r--r-- | tools/driver/driver.cpp | 2 |
5 files changed, 63 insertions, 55 deletions
diff --git a/include/clang/Driver/Compilation.h b/include/clang/Driver/Compilation.h index 0e66796a6e..3ec221f41d 100644 --- a/include/clang/Driver/Compilation.h +++ b/include/clang/Driver/Compilation.h @@ -69,6 +69,11 @@ public: const ActionList &getActions() const { return Actions; } JobList &getJobs() { return Jobs; } + const JobList &getJobs() const { return Jobs; } + + const ArgStringList &getTempFiles() const { return TempFiles; } + + const ArgStringList &getResultFiles() const { return ResultFiles; } /// getArgsForToolChain - Return the derived argument list for the /// tool chain \arg TC (or the default tool chain, if TC is not @@ -89,11 +94,6 @@ public: return Name; } - /// Execute - Execute the compilation jobs and return an - /// appropriate exit code. - int Execute() const; - -private: /// CleanupFileList - Remove the files in the given list. /// /// \param IssueErrors - Report failures as errors. @@ -120,7 +120,7 @@ private: /// ExecuteJob - Execute a single job. /// /// \param FailingCommand - For non-zero results, this will be set to the - /// Command which failed, if any. + /// Command which failed. /// \return The accumulated result code of the job. int ExecuteJob(const Job &J, const Command *&FailingCommand) const; }; diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h index 66e3b97875..c0def2bcca 100644 --- a/include/clang/Driver/Driver.h +++ b/include/clang/Driver/Driver.h @@ -161,6 +161,14 @@ public: /// \arg C - The compilation that is being built. void BuildJobs(Compilation &C) const; + /// ExecuteCompilation - Execute the compilation according to the command line + /// arguments and return an appropriate exit code. + /// + /// This routine handles additional processing that must be done in addition + /// to just running the subprocesses, for example reporting errors, removing + /// temporary files, etc. + int ExecuteCompilation(const Compilation &C) const; + /// @} /// @name Helper Methods /// @{ diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index bdb39c7fec..d7901a69e0 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -155,51 +155,3 @@ int Compilation::ExecuteJob(const Job &J, return 0; } } - -int Compilation::Execute() const { - // Just print if -### was present. - if (getArgs().hasArg(options::OPT__HASH_HASH_HASH)) { - PrintJob(llvm::errs(), Jobs, "\n", true); - return 0; - } - - // If there were errors building the compilation, quit now. - if (getDriver().getDiags().getNumErrors()) - return 1; - - const Command *FailingCommand = 0; - int Res = ExecuteJob(Jobs, FailingCommand); - - // Remove temp files. - CleanupFileList(TempFiles); - - // If the compilation failed, remove result files as well. - if (Res != 0 && !getArgs().hasArg(options::OPT_save_temps)) - CleanupFileList(ResultFiles, true); - - // Print extra information about abnormal failures, if possible. - if (Res) { - // This is ad-hoc, but we don't want to be excessively noisy. If the result - // status was 1, assume the command failed normally. In particular, if it - // was the compiler then assume it gave a reasonable error code. Failures in - // other tools are less common, and they generally have worse diagnostics, - // so always print the diagnostic there. - const Action &Source = FailingCommand->getSource(); - bool IsFriendlyTool = (isa<PreprocessJobAction>(Source) || - isa<PrecompileJobAction>(Source) || - isa<AnalyzeJobAction>(Source) || - isa<CompileJobAction>(Source)); - - if (!IsFriendlyTool || Res != 1) { - // FIXME: See FIXME above regarding result code interpretation. - if (Res < 0) - getDriver().Diag(clang::diag::err_drv_command_signalled) - << Source.getClassName() << -Res; - else - getDriver().Diag(clang::diag::err_drv_command_failed) - << Source.getClassName() << Res; - } - } - - return Res; -} diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 2e90accf34..df72426057 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -217,6 +217,54 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) { return C; } +int Driver::ExecuteCompilation(const Compilation &C) const { + // Just print if -### was present. + if (C.getArgs().hasArg(options::OPT__HASH_HASH_HASH)) { + C.PrintJob(llvm::errs(), C.getJobs(), "\n", true); + return 0; + } + + // If there were errors building the compilation, quit now. + if (getDiags().getNumErrors()) + return 1; + + const Command *FailingCommand = 0; + int Res = C.ExecuteJob(C.getJobs(), FailingCommand); + + // Remove temp files. + C.CleanupFileList(C.getTempFiles()); + + // If the compilation failed, remove result files as well. + if (Res != 0 && !C.getArgs().hasArg(options::OPT_save_temps)) + C.CleanupFileList(C.getResultFiles(), true); + + // Print extra information about abnormal failures, if possible. + if (Res) { + // This is ad-hoc, but we don't want to be excessively noisy. If the result + // status was 1, assume the command failed normally. In particular, if it + // was the compiler then assume it gave a reasonable error code. Failures in + // other tools are less common, and they generally have worse diagnostics, + // so always print the diagnostic there. + const Action &Source = FailingCommand->getSource(); + bool IsFriendlyTool = (isa<PreprocessJobAction>(Source) || + isa<PrecompileJobAction>(Source) || + isa<AnalyzeJobAction>(Source) || + isa<CompileJobAction>(Source)); + + if (!IsFriendlyTool || Res != 1) { + // FIXME: See FIXME above regarding result code interpretation. + if (Res < 0) + Diag(clang::diag::err_drv_command_signalled) + << Source.getClassName() << -Res; + else + Diag(clang::diag::err_drv_command_failed) + << Source.getClassName() << Res; + } + } + + return Res; +} + void Driver::PrintOptions(const ArgList &Args) const { unsigned i = 0; for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index 804bef4058..323283e653 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -219,7 +219,7 @@ int main(int argc, const char **argv) { int Res = 0; if (C.get()) - Res = C->Execute(); + Res = TheDriver.ExecuteCompilation(*C); llvm::llvm_shutdown(); |