summaryrefslogtreecommitdiff
path: root/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
commiteeb37f1a568185c46f600fb34769ec376bf5bfaf (patch)
tree10232a1eb6e6237bb70acb2627d8d1a4e227f7b3 /lib/Support/DynamicLibrary.cpp
parent11e03e7c2d0c163e54b911ad1e665616dc0bcc8c (diff)
downloadllvm-eeb37f1a568185c46f600fb34769ec376bf5bfaf.tar.gz
llvm-eeb37f1a568185c46f600fb34769ec376bf5bfaf.tar.bz2
llvm-eeb37f1a568185c46f600fb34769ec376bf5bfaf.tar.xz
Make DynamicLibrary thread-safe w/r/t call to dlerror() after dlopen(). PR10718
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138260 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/DynamicLibrary.cpp')
-rw-r--r--lib/Support/DynamicLibrary.cpp3
1 files changed, 2 insertions, 1 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 *>();