6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-23 02:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix another hang caused by ManagedStatic in SignalHandler

Browse Source 
Fix two other variables that might cause the same hang fixed in r235914.
The hang is caused by constructing ManagedStatic in signalhandler. In
this case, if FileToRemove or CallBacksToRun is not contructed, it means
there is no work to do.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236741 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Steven Wu 2015-05-07 16:20:51 +00:00
parent 39cf555429
commit b05b828eab
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Support/Unix/Signals.inc
View File

@ -139,6 +139,11 @@ static void UnregisterHandlers() {
/// NB: This must be an async signal safe function. It cannot allocate or free
/// memory, even in debug builds.
static void RemoveFilesToRemove() {
// Avoid constructing ManagedStatic in the signal handler.
// If FilesToRemove is not constructed, there are no files to remove.
if (!FilesToRemove.isConstructed())
return;
// We avoid iterators in case of debug iterators that allocate or release
// memory.
std::vector<std::string>& FilesToRemoveRef = *FilesToRemove;
@ -200,10 +205,12 @@ static RETSIGTYPE SignalHandler(int Sig) {
}
// Otherwise if it is a fault (like SEGV) run any handler.
std::vector<std::pair<void (*)(void *), void *>>& CallBacksToRunRef =
*CallBacksToRun;
for (unsigned i = 0, e = CallBacksToRun->size(); i != e; ++i)
CallBacksToRunRef[i].first(CallBacksToRunRef[i].second);
if (CallBacksToRun.isConstructed()) {
std::vector<std::pair<void (*)(void *), void *>>& CallBacksToRunRef =
*CallBacksToRun;
for (unsigned i = 0, e = CallBacksToRun->size(); i != e; ++i)
CallBacksToRunRef[i].first(CallBacksToRunRef[i].second);
}
#ifdef __s390__
// On S/390, certain signals are delivered with PSW Address pointing to