diff options
author | Alexandre Ganea <alexandre.ganea@ubisoft.com> | 2020-02-06 15:25:26 -0500 |
---|---|---|
committer | Hans Wennborg <hans@chromium.org> | 2020-02-10 15:30:01 +0100 |
commit | 793d643f6d69e6908a6ece4aacb07b6573e33e18 (patch) | |
tree | 25279d225e915709337fe570d7e3eaa77c17ecbc | |
parent | b8fead783fa19d48a2e2c3162fba5271360f57b5 (diff) | |
download | bcm5719-llvm-793d643f6d69e6908a6ece4aacb07b6573e33e18.tar.gz bcm5719-llvm-793d643f6d69e6908a6ece4aacb07b6573e33e18.zip |
[Clang] Remove unused #pragma clang __debug handle_crash
As discussed in D70568, remove this because it isn't used anywhere, and I think it's better to go through real crashes for testing (#pragma clang __debug crash).
Also remove the support function llvm::CrashRecoveryContext::HandleCrash() which was added at the same time by @ddunbar.
Differential Revision: https://reviews.llvm.org/D74063
(cherry picked from commit 8ecde3ac34bbb5a8d53d8ec5cd32867658646df1)
-rw-r--r-- | clang/lib/Lex/Pragma.cpp | 5 | ||||
-rw-r--r-- | llvm/include/llvm/Support/CrashRecoveryContext.h | 4 | ||||
-rw-r--r-- | llvm/lib/Support/CrashRecoveryContext.cpp | 8 |
3 files changed, 0 insertions, 17 deletions
diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index e4636265a72..c881bcac9f3 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -39,7 +39,6 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" #include <algorithm> @@ -1105,10 +1104,6 @@ struct PragmaDebugHandler : public PragmaHandler { M->dump(); } else if (II->isStr("overflow_stack")) { DebugOverflowStack(); - } else if (II->isStr("handle_crash")) { - llvm::CrashRecoveryContext *CRC =llvm::CrashRecoveryContext::GetCurrent(); - if (CRC) - CRC->HandleCrash(); } else if (II->isStr("captured")) { HandleCaptured(PP); } else { diff --git a/llvm/include/llvm/Support/CrashRecoveryContext.h b/llvm/include/llvm/Support/CrashRecoveryContext.h index 9522c474224..beeb855c7c5 100644 --- a/llvm/include/llvm/Support/CrashRecoveryContext.h +++ b/llvm/include/llvm/Support/CrashRecoveryContext.h @@ -97,10 +97,6 @@ public: return RunSafelyOnThread([&]() { Fn(UserData); }, RequestedStackSize); } - /// Explicitly trigger a crash recovery in the current process, and - /// return failure from RunSafely(). This function does not return. - void HandleCrash(); - /// In case of a crash, this is the crash identifier. int RetCode = 0; diff --git a/llvm/lib/Support/CrashRecoveryContext.cpp b/llvm/lib/Support/CrashRecoveryContext.cpp index 510f46abe4b..a24bf7bf255 100644 --- a/llvm/lib/Support/CrashRecoveryContext.cpp +++ b/llvm/lib/Support/CrashRecoveryContext.cpp @@ -406,14 +406,6 @@ bool CrashRecoveryContext::RunSafely(function_ref<void()> Fn) { #endif // !_MSC_VER -void CrashRecoveryContext::HandleCrash() { - CrashRecoveryContextImpl *CRCI = (CrashRecoveryContextImpl *) Impl; - assert(CRCI && "Crash recovery context never initialized!"); - // As per convention, -2 indicates a crash or timeout as opposed to failure to - // execute (see llvm/include/llvm/Support/Program.h) - CRCI->HandleCrash(-2, 0); -} - // FIXME: Portability. static void setThreadBackgroundPriority() { #ifdef __APPLE__ |