aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Support/DynamicLibrary.cpp
diff options
context:
space:
mode:
authorJordy Rose <jediknil@belkadan.com>2011-08-22 19:01:52 +0000
committerJordy Rose <jediknil@belkadan.com>2011-08-22 19:01:52 +0000
commit5765f4c24cc44129f63926ec5f2752aab1619f45 (patch)
tree10aecf66da51a60431781bb6ee4248485386e156 /llvm/lib/Support/DynamicLibrary.cpp
parent752de1443f5c2cb3e06c06f2e2e6c9d50ec4d119 (diff)
downloadllvm-5765f4c24cc44129f63926ec5f2752aab1619f45.zip
llvm-5765f4c24cc44129f63926ec5f2752aab1619f45.tar.gz
llvm-5765f4c24cc44129f63926ec5f2752aab1619f45.tar.bz2
Make DynamicLibrary thread-safe w/r/t call to dlerror() after dlopen(). PR10718
llvm-svn: 138260
Diffstat (limited to 'llvm/lib/Support/DynamicLibrary.cpp')
-rw-r--r--llvm/lib/Support/DynamicLibrary.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp
index 5ee6a82..fb02c07 100644
--- a/llvm/lib/Support/DynamicLibrary.cpp
+++ b/llvm/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 *>();