From 59e5a644353eca5d1e683eeef646745e55e0e589 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Tue, 21 Feb 2017 17:30:43 +0000 Subject: Do not leak OpenedHandles. Reviewed by Vedant Kumar (D30178) llvm-svn: 295737 --- llvm/lib/Support/DynamicLibrary.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'llvm/lib/Support/DynamicLibrary.cpp') 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 *OpenedHandles = nullptr; +static llvm::ManagedStatic > 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(); - // 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::iterator I = OpenedHandles->begin(), E = OpenedHandles->end(); I != E; ++I) { //lt_ptr ptr = lt_dlsym(*I, symbolName); -- cgit v1.2.3