diff options
| -rw-r--r-- | lib/Support/DynamicLibrary.cpp | 3 | ||||
| -rw-r--r-- | lib/Support/Windows/DynamicLibrary.inc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp index 5ee6a82ad7..fb02c07e4a 100644 --- a/lib/Support/DynamicLibrary.cpp +++ b/lib/Support/DynamicLibrary.cpp @@ -72,6 +72,8 @@ static DenseSet<void *> *OpenedHandles = 0; DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, std::string *errMsg) { + SmartScopedLock<true> lock(getMutex()); + void *handle = dlopen(filename, RTLD_LAZY|RTLD_GLOBAL); if (handle == 0) { if (errMsg) *errMsg = dlerror(); @@ -85,7 +87,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, handle = RTLD_DEFAULT; #endif - SmartScopedLock<true> lock(getMutex()); if (OpenedHandles == 0) OpenedHandles = new DenseSet<void *>(); diff --git a/lib/Support/Windows/DynamicLibrary.inc b/lib/Support/Windows/DynamicLibrary.inc index 5a0b2491f0..83da82a949 100644 --- a/lib/Support/Windows/DynamicLibrary.inc +++ b/lib/Support/Windows/DynamicLibrary.inc @@ -71,9 +71,10 @@ extern "C" { DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, std::string *errMsg) { + SmartScopedLock<true> lock(getMutex()); + if (!filename) { // When no file is specified, enumerate all DLLs and EXEs in the process. - SmartScopedLock<true> lock(getMutex()); if (OpenedHandles == 0) OpenedHandles = new DenseSet<HMODULE>(); @@ -90,7 +91,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, return DynamicLibrary(); } - SmartScopedLock<true> lock(getMutex()); if (OpenedHandles == 0) OpenedHandles = new DenseSet<HMODULE>(); |