Don't leak the mutex when loading dynamic libraries.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121119 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
index cd9927a..455c380 100644
--- a/lib/Support/DynamicLibrary.cpp
+++ b/lib/Support/DynamicLibrary.cpp
@@ -61,17 +61,12 @@
//=== independent code.
//===----------------------------------------------------------------------===//
-static SmartMutex<true>* HandlesMutex;
static std::vector<void *> *OpenedHandles = 0;
-static bool InitializeMutex() {
- HandlesMutex = new SmartMutex<true>;
- return HandlesMutex != 0;
-}
-static bool EnsureMutexInitialized() {
- static bool result = InitializeMutex();
- return result;
+static SmartMutex<true>& getMutex() {
+ static SmartMutex<true> HandlesMutex;
+ return HandlesMutex;
}
@@ -88,8 +83,7 @@
if (Filename == NULL)
H = RTLD_DEFAULT;
#endif
- EnsureMutexInitialized();
- SmartScopedLock<true> Lock(*HandlesMutex);
+ SmartScopedLock<true> Lock(getMutex());
if (OpenedHandles == 0)
OpenedHandles = new std::vector<void *>();
OpenedHandles->push_back(H);
@@ -124,8 +118,7 @@
#if HAVE_DLFCN_H
// Now search the libraries.
- EnsureMutexInitialized();
- SmartScopedLock<true> Lock(*HandlesMutex);
+ SmartScopedLock<true> Lock(getMutex());
if (OpenedHandles) {
for (std::vector<void *>::iterator I = OpenedHandles->begin(),
E = OpenedHandles->end(); I != E; ++I) {