6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-20 10:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Revert r219638, (r219640 and r219676), "Removing the static destructor from ManagedStatic.cpp by controlling the allocation and de-allocation of the mutex."

Browse Source 
It caused hang-up on msc17 builder, probably deadlock.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219687 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2014-10-14 15:58:16 +00:00
parent ad5d223cb5
commit 65e4aa4656
2 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/llvm/Support/Threading.h
View File

@ -15,10 +15,6 @@
#ifndef LLVM_SUPPORT_THREADING_H
#define LLVM_SUPPORT_THREADING_H
#if !defined(__MINGW__)
#include <mutex>
#endif
namespace llvm {
/// Returns true if LLVM is compiled with support for multi-threading, and
/// false otherwise.
@ -37,33 +33,6 @@ namespace llvm {
/// the thread stack.
void llvm_execute_on_thread(void (*UserFn)(void*), void *UserData,
unsigned RequestedStackSize = 0);
/// \brief Execute the function specified as a template parameter once.
///
/// Calls \p UserFn once ever. The call uniqueness is based on the address of
/// the function passed in via the template arguement. This means no matter how
/// many times you call llvm_call_once<foo>() in the same or different
/// locations, foo will only be called once.
///
/// Typical usage:
/// \code
/// void foo() {...};
/// ...
/// llvm_call_once<foo>();
/// \endcode
///
/// \tparam UserFn Function to call once.
template <void (*UserFn)(void)> void llvm_call_once() {
#if !defined(__MINGW__)
static std::once_flag flag;
std::call_once(flag, UserFn);
#else
struct InitOnceWrapper {
InitOnceWrapper() { UserFn(); }
};
static InitOnceWrapper InitOnceVar;
#endif
}
}
#endif

23
lib/Support/ManagedStatic.cpp
View File

@ -16,22 +16,16 @@
#include "llvm/Support/Atomic.h"
#include "llvm/Support/Mutex.h"
#include "llvm/Support/MutexGuard.h"
#include "llvm/Support/Threading.h"
#include <cassert>
using namespace llvm;
static const ManagedStaticBase *StaticList = nullptr;
static sys::Mutex *ManagedStaticMutex = nullptr;
static void initializeMutex() {
ManagedStaticMutex = new sys::Mutex();
}
static sys::Mutex* getManagedStaticMutex() {
static sys::Mutex& getManagedStaticMutex() {
// We need to use a function local static here, since this can get called
// during a static constructor and we need to guarantee that it's initialized
// correctly.
llvm_call_once<initializeMutex>();
static sys::Mutex ManagedStaticMutex;
return ManagedStaticMutex;
}
@ -39,7 +33,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
void (*Deleter)(void*)) const {
assert(Creator);
if (llvm_is_multithreaded()) {
MutexGuard Lock(*getManagedStaticMutex());
MutexGuard Lock(getManagedStaticMutex());
if (!Ptr) {
void* tmp = Creator();
@ -89,13 +83,8 @@ void ManagedStaticBase::destroy() const {
/// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
void llvm::llvm_shutdown() {
{
MutexGuard Lock(*getManagedStaticMutex());
MutexGuard Lock(getManagedStaticMutex());
while (StaticList)
StaticList->destroy();
}
delete ManagedStaticMutex;
ManagedStaticMutex = nullptr;
while (StaticList)
StaticList->destroy();
}