X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FManagedStatic.cpp;h=b1feddc09ec63ea611b78aa690831f7b03bb83e2;hb=153cd65fd46ffdcd416b64f7ec51dff808fc453f;hp=9d7e99f97fb5637c7f837abc834c0f238c174031;hpb=761f33167f2ae180dddcf48abcfcc3ead0c2d219;p=oota-llvm.git

diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp
index 9d7e99f97fb..b1feddc09ec 100644
--- a/lib/Support/ManagedStatic.cpp
+++ b/lib/Support/ManagedStatic.cpp
@@ -14,33 +14,33 @@
 #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 "llvm/Support/Threading.h"
 #include <cassert>
-#include <mutex>
 using namespace llvm;
 
 static const ManagedStaticBase *StaticList = nullptr;
+static sys::Mutex *ManagedStaticMutex = nullptr;
+LLVM_DEFINE_ONCE_FLAG(mutex_init_flag);
 
-// 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(); } );
+static void initializeMutex() {
+  ManagedStaticMutex = new sys::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.
+  call_once(mutex_init_flag, initializeMutex);
+  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,10 +90,8 @@ 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();
-
-  if (llvm_is_multithreaded()) llvm_stop_multithreaded();
 }