From: Yaron Keren <yaron.keren@gmail.com>
Date: Wed, 22 Jul 2015 21:11:17 +0000 (+0000)
Subject: Rename RunCallBacksToRun to llvm::sys::RunSignalHandlers
X-Git-Tag: android-x86-7.1-r4~45565
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=27513fc040857fd8a4db6516535a93e42f2b9f36;p=android-x86%2Fexternal-llvm.git

Rename RunCallBacksToRun to llvm::sys::RunSignalHandlers

And expose it in Signals.h, allowing clients to call it directly,
possibly LLVMErrorHandler which currently calls RunInterruptHandlers
but not RunSignalHandlers, thus for example not printing the stack
backtrace on Unixish OSes. On Windows it does happen because
RunInterruptHandlers ends up calling the callbacks as well via
Cleanup(). This difference in behaviour and code structures in
*/Signals.inc should be patched in the future.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242936 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h
index 7e165d7f3a4..2a4d84bd891 100644
--- a/include/llvm/Support/Signals.h
+++ b/include/llvm/Support/Signals.h
@@ -47,6 +47,9 @@ namespace sys {
   /// \brief Print the stack trace using the given \c raw_ostream object.
   void PrintStackTrace(raw_ostream &OS);
 
+  // Run all registered signal handlers.
+  void RunSignalHandlers();
+
   /// AddSignalHandler - Add a function to be called when an abort/kill signal
   /// is delivered to the process.  The handler can have a cookie passed to it
   /// to identify what instance of the handler it is.
diff --git a/lib/Support/Signals.cpp b/lib/Support/Signals.cpp
index 598ef50175a..2c3560c3be9 100644
--- a/lib/Support/Signals.cpp
+++ b/lib/Support/Signals.cpp
@@ -28,7 +28,7 @@ using namespace sys;
 
 static ManagedStatic<std::vector<std::pair<void (*)(void *), void *>>>
     CallBacksToRun;
-void RunCallBacksToRun() {
+void sys::RunSignalHandlers() {
   if (!CallBacksToRun.isConstructed())
     return;
   for (auto &I : *CallBacksToRun)
diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
index caccf7b377c..2332db58bfc 100644
--- a/lib/Support/Unix/Signals.inc
+++ b/lib/Support/Unix/Signals.inc
@@ -201,7 +201,7 @@ static RETSIGTYPE SignalHandler(int Sig) {
   }
 
   // Otherwise if it is a fault (like SEGV) run any handler.
-  RunCallBacksToRun();
+  llvm::sys::RunSignalHandlers();
 
 #ifdef __s390__
   // On S/390, certain signals are delivered with PSW Address pointing to
diff --git a/lib/Support/Windows/Signals.inc b/lib/Support/Windows/Signals.inc
index c8bc646fd2c..824edb3c39b 100644
--- a/lib/Support/Windows/Signals.inc
+++ b/lib/Support/Windows/Signals.inc
@@ -457,7 +457,7 @@ static void Cleanup() {
       llvm::sys::fs::remove(FilesToRemove->back());
       FilesToRemove->pop_back();
     }
-  RunCallBacksToRun();
+  llvm::sys::RunSignalHandlers();
   LeaveCriticalSection(&CriticalSection);
 }