Avoid the deprecated GetVersionEx API

[oota-llvm.git] / lib / Support / ManagedStatic.cpp

diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp
index fbcce598b21b961b50532dade1e3dffaecdf7f8c..9868207b14ff2733ba7c8ea75b81ec6a98b7abe4 100644 (file)
--- a/lib/Support/ManagedStatic.cpp
+++ b/lib/Support/ManagedStatic.cpp
@@ -14,24 +14,19 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Config/config.h"
 #include "llvm/Support/Atomic.h"
+#include "llvm/Support/Compiler.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 +34,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 +84,8 @@ void ManagedStaticBase::destroy() const {
 
 /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
 void llvm::llvm_shutdown() {
-  {
-    MutexGuard Lock(*getManagedStaticMutex());
-
-    while (StaticList)
-      StaticList->destroy();
-  }
+  MutexGuard Lock(getManagedStaticMutex());
 
-  delete ManagedStaticMutex;
-  ManagedStaticMutex = nullptr;
+  while (StaticList)
+    StaticList->destroy();
 }