diff options
| author | Jordy Rose <jediknil@belkadan.com> | 2011-08-22 19:01:52 +0000 |
|---|---|---|
| committer | Jordy Rose <jediknil@belkadan.com> | 2011-08-22 19:01:52 +0000 |
| commit | 5765f4c24cc44129f63926ec5f2752aab1619f45 (patch) | |
| tree | 10aecf66da51a60431781bb6ee4248485386e156 /llvm/lib/Support/Windows | |
| parent | 752de1443f5c2cb3e06c06f2e2e6c9d50ec4d119 (diff) | |
| download | bcm5719-llvm-5765f4c24cc44129f63926ec5f2752aab1619f45.tar.gz bcm5719-llvm-5765f4c24cc44129f63926ec5f2752aab1619f45.zip | |
Make DynamicLibrary thread-safe w/r/t call to dlerror() after dlopen(). PR10718
llvm-svn: 138260
Diffstat (limited to 'llvm/lib/Support/Windows')
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index 5a0b2491f00..83da82a949c 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/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>(); |
