diff options
-rw-r--r-- | lib/Support/ManagedStatic.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp index da01195a9d..b8fb2841e5 100644 --- a/lib/Support/ManagedStatic.cpp +++ b/lib/Support/ManagedStatic.cpp @@ -14,33 +14,26 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Config/config.h" #include "llvm/Support/Atomic.h" +#include "llvm/Support/Mutex.h" +#include "llvm/Support/MutexGuard.h" #include <cassert> -#include <mutex> using namespace llvm; static const ManagedStaticBase *StaticList = nullptr; -// ManagedStatics can get created during execution of static constructors. As a -// result, we cannot use a global static std::mutex object for the lock since it -// may not have been constructed. Instead, we do a call-once initialization of -// a pointer to a mutex. -static std::once_flag MutexInitializationFlag; -static std::recursive_mutex* ManagedStaticMutex = nullptr; - -// Not all supported platforms (in particular VS2012) have thread-safe function -// static initialization, so roll our own. -static std::recursive_mutex& GetManagedStaticMutex() { - std::call_once(MutexInitializationFlag, - []() { ManagedStaticMutex = new std::recursive_mutex(); } ); - - return *ManagedStaticMutex; +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. + static sys::Mutex ManagedStaticMutex; + return ManagedStaticMutex; } void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), void (*Deleter)(void*)) const { assert(Creator); if (llvm_is_multithreaded()) { - std::lock_guard<std::recursive_mutex> Lock(GetManagedStaticMutex()); + MutexGuard Lock(getManagedStaticMutex()); if (!Ptr) { void* tmp = Creator(); @@ -90,7 +83,7 @@ void ManagedStaticBase::destroy() const { /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables. void llvm::llvm_shutdown() { - std::lock_guard<std::recursive_mutex> Lock(GetManagedStaticMutex()); + MutexGuard Lock(getManagedStaticMutex()); while (StaticList) StaticList->destroy(); |