Make DynamicLibrary thread-safe w/r/t call to dlerror() after dlopen(). PR10718

llvm-svn: 138260
2011-08-22 19:01:52 +00:00
parent 752de1443f
commit 5765f4c24c
2 changed files with 4 additions and 3 deletions
--- 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 *>();