From c88a88f6f7672b6bb831dce9da4acfa0c846975f Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 1 Jul 2009 20:03:04 +0000 Subject: Driver: Move Compilation::Execute to Driver::ExecuteCompilation. - The Compilation is just a helper class, it shouldn't have that amount of logic in it. - No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74634 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Compilation.cpp | 48 ---------------------------------------------- 1 file changed, 48 deletions(-) (limited to 'lib/Driver/Compilation.cpp') 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(Source) || - isa(Source) || - isa(Source) || - isa(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; -} -- cgit v1.2.3-18-g5258