Kill the LLVM global lock.

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

3 files changed, 23 insertions, 7 deletions

diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp
index 1117190888..ced2b13b3a 100644
--- a/lib/Support/ManagedStatic.cpp
+++ b/lib/Support/ManagedStatic.cpp
@@ -16,16 +16,34 @@
 #include "llvm/Support/Atomic.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.  This also means that we must not "initialize" the
+// mutex with nullptr, otherwise it might get reset to nullptr after being
+// initialized by std::call_once.
+static std::once_flag MutexInitializationFlag;
+static std::recursive_mutex *ManagedStaticMutex;
+
+namespace {
+  void InitializeManagedStaticMutex() {
+    std::call_once(MutexInitializationFlag,
+        []() { ManagedStaticMutex = new std::recursive_mutex(); });
+  }
+}
+
 void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
                                               void (*Deleter)(void*)) const {
   assert(Creator);
   if (llvm_is_multithreaded()) {
-    llvm::MutexGuard Lock(llvm::llvm_get_global_lock());
+    InitializeManagedStaticMutex();
 
+    std::lock_guard<std::recursive_mutex> Lock(*ManagedStaticMutex);
     if (!Ptr) {
       void* tmp = Creator();
 
@@ -74,6 +92,9 @@ void ManagedStaticBase::destroy() const {
 
 /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
 void llvm::llvm_shutdown() {
+  InitializeManagedStaticMutex();
+  std::lock_guard<std::recursive_mutex> Lock(*ManagedStaticMutex);
+
   while (StaticList)
     StaticList->destroy();
 }
diff --git a/lib/Support/Threading.cpp b/lib/Support/Threading.cpp
index ff591aaa1d..838a71b789 100644
--- a/lib/Support/Threading.cpp
+++ b/lib/Support/Threading.cpp
@@ -20,11 +20,6 @@
 
 using namespace llvm;
 
-sys::Mutex& llvm::llvm_get_global_lock() {
-  static sys::Mutex global_lock;
-  return global_lock;
-}
-
 bool llvm::llvm_is_multithreaded() {
 #if LLVM_ENABLE_THREADS != 0
   return true;
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index c7427260bf..7738283bad 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -84,7 +84,7 @@ static TimerGroup *getDefaultTimerGroup() {
   sys::MemoryFence();
   if (tmp) return tmp;
   
-  llvm::MutexGuard Lock(llvm::llvm_get_global_lock());
+  sys::SmartScopedLock<true> Lock(*TimerLock);
   tmp = DefaultTimerGroup;
   if (!tmp) {
     tmp = new TimerGroup("Miscellaneous Ungrouped Timers");