diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-13 15:01:11 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-13 15:01:11 +0000 |
commit | dbe027a9ed9309d5dd103896f3548f23e958986b (patch) | |
tree | ab4c44bbed03a1c0f34c5a7ee2e6271bb3b93e15 /llvm/utils/KillTheDoctor/KillTheDoctor.cpp | |
parent | 6bf04e45122ebfa64880e777e9fd00a24116a77c (diff) | |
download | bcm5719-llvm-dbe027a9ed9309d5dd103896f3548f23e958986b.tar.gz bcm5719-llvm-dbe027a9ed9309d5dd103896f3548f23e958986b.zip |
Fix KillTheDoctor after r210725.
We don't map these windows errors to generic ones since errc::timed_out is
not defined on mingw. Just use the raw windows error value.
llvm-svn: 210910
Diffstat (limited to 'llvm/utils/KillTheDoctor/KillTheDoctor.cpp')
-rw-r--r-- | llvm/utils/KillTheDoctor/KillTheDoctor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/utils/KillTheDoctor/KillTheDoctor.cpp b/llvm/utils/KillTheDoctor/KillTheDoctor.cpp index 84f9b19f950..a85dac8ae85 100644 --- a/llvm/utils/KillTheDoctor/KillTheDoctor.cpp +++ b/llvm/utils/KillTheDoctor/KillTheDoctor.cpp @@ -37,6 +37,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/Errc.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" @@ -424,9 +425,10 @@ int main(int argc, char **argv) { success = WaitForDebugEvent(&DebugEvent, TimeLeft); if (!success) { - ec = windows_error(::GetLastError()); + DWORD LastError = ::GetLastError(); + ec = windows_error(LastError); - if (ec == std::errc::timed_out) { + if (LastError == ERROR_SEM_TIMEOUT || LastError == WSAETIMEDOUT) { errs() << ToolName << ": Process timed out.\n"; ::TerminateProcess(ProcessInfo.hProcess, -1); // Otherwise other stuff starts failing... |