diff options
| author | Vassil Vassilev <v.g.vassilev@gmail.com> | 2017-02-21 17:30:43 +0000 |
|---|---|---|
| committer | Vassil Vassilev <v.g.vassilev@gmail.com> | 2017-02-21 17:30:43 +0000 |
| commit | 59e5a644353eca5d1e683eeef646745e55e0e589 (patch) | |
| tree | e510d904fbeaec13a78d1ace100010e64c4305a8 /llvm/lib/Support/DynamicLibrary.cpp | |
| parent | 5afda309303a7902ee44c5799cd0ef0dfaa48a2a (diff) | |
| download | bcm5719-llvm-59e5a644353eca5d1e683eeef646745e55e0e589.tar.gz bcm5719-llvm-59e5a644353eca5d1e683eeef646745e55e0e589.zip | |
Do not leak OpenedHandles.
Reviewed by Vedant Kumar (D30178)
llvm-svn: 295737
Diffstat (limited to 'llvm/lib/Support/DynamicLibrary.cpp')
| -rw-r--r-- | llvm/lib/Support/DynamicLibrary.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp index ced21e46afe..74d94d33d5a 100644 --- a/llvm/lib/Support/DynamicLibrary.cpp +++ b/llvm/lib/Support/DynamicLibrary.cpp @@ -9,8 +9,6 @@ // // This file implements the operating system DynamicLibrary concept. // -// FIXME: This file leaks ExplicitSymbols and OpenedHandles! -// //===----------------------------------------------------------------------===// #include "llvm/Support/DynamicLibrary.h" @@ -51,7 +49,7 @@ using namespace llvm::sys; //=== independent code. //===----------------------------------------------------------------------===// -static DenseSet<void *> *OpenedHandles = nullptr; +static llvm::ManagedStatic<DenseSet<void *> > OpenedHandles; DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, std::string *errMsg) { @@ -70,9 +68,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, handle = RTLD_DEFAULT; #endif - if (!OpenedHandles) - OpenedHandles = new DenseSet<void *>(); - // If we've already loaded this library, dlclose() the handle in order to // keep the internal refcount at +1. if (!OpenedHandles->insert(handle).second) @@ -121,7 +116,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { #if defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN) // Now search the libraries. - if (OpenedHandles) { + if (OpenedHandles.isConstructed()) { for (DenseSet<void *>::iterator I = OpenedHandles->begin(), E = OpenedHandles->end(); I != E; ++I) { //lt_ptr ptr = lt_dlsym(*I, symbolName); |
