From c2275676c1bde4ed20c06affdeeb1a93692f29a8 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 12 Oct 2018 18:08:11 +0000 Subject: [PATCH] Revert r344375 "[Driver] check for exit code from SIGPIPE" This doesn't build on Windows. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@344389 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Driver.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index aed81de5ea..73639f378b 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -78,7 +78,6 @@ #include "llvm/Support/raw_ostream.h" #include #include -#include #include #if LLVM_ON_UNIX #include // getpid @@ -1389,9 +1388,8 @@ int Driver::ExecuteCompilation( // Otherwise, remove result files and print extra information about abnormal // failures. - int Res = 0; for (const auto &CmdPair : FailingCommands) { - int CommandRes = CmdPair.first; + int Res = CmdPair.first; const Command *FailingCommand = CmdPair.second; // Remove result files if we're not saving temps. @@ -1400,17 +1398,10 @@ int Driver::ExecuteCompilation( C.CleanupFileMap(C.getResultFiles(), JA, true); // Failure result files are valid unless we crashed. - if (CommandRes < 0) + if (Res < 0) C.CleanupFileMap(C.getFailureResultFiles(), JA, true); } - // llvm/lib/Support/Unix/Signals.inc will exit with a special return code - // for SIGPIPE. Do not print diagnostics for this case. - if (CommandRes == EX_IOERR) { - Res = CommandRes; - continue; - } - // Print extra information about abnormal failures, if possible. // // This is ad-hoc, but we don't want to be excessively noisy. If the result @@ -1420,17 +1411,17 @@ int Driver::ExecuteCompilation( // diagnostics, so always print the diagnostic there. const Tool &FailingTool = FailingCommand->getCreator(); - if (!FailingCommand->getCreator().hasGoodDiagnostics() || CommandRes != 1) { + if (!FailingCommand->getCreator().hasGoodDiagnostics() || Res != 1) { // FIXME: See FIXME above regarding result code interpretation. - if (CommandRes < 0) + if (Res < 0) Diag(clang::diag::err_drv_command_signalled) << FailingTool.getShortName(); else - Diag(clang::diag::err_drv_command_failed) - << FailingTool.getShortName() << CommandRes; + Diag(clang::diag::err_drv_command_failed) << FailingTool.getShortName() + << Res; } } - return Res; + return 0; } void Driver::PrintHelp(bool ShowHidden) const { -- 2.40.0