summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/include/llvm/Support/DynamicLibrary.h15
-rw-r--r--llvm/lib/Support/DynamicLibrary.cpp26
-rw-r--r--llvm/lib/Support/Windows/DynamicLibrary.inc39
3 files changed, 14 insertions, 66 deletions
diff --git a/llvm/include/llvm/Support/DynamicLibrary.h b/llvm/include/llvm/Support/DynamicLibrary.h
index ea49a16dd02..a7d22212dbd 100644
--- a/llvm/include/llvm/Support/DynamicLibrary.h
+++ b/llvm/include/llvm/Support/DynamicLibrary.h
@@ -14,8 +14,6 @@
#ifndef LLVM_SUPPORT_DYNAMICLIBRARY_H
#define LLVM_SUPPORT_DYNAMICLIBRARY_H
-#include "llvm/Support/Mutex.h"
-
#include <string>
namespace llvm {
@@ -45,11 +43,6 @@ namespace sys {
// Opaque data used to interface with OS-specific dynamic library handling.
void *Data;
- // Adds a opened library handle to the list of OpenedHandles.
- static DynamicLibrary addPermanentLibraryWithLock(void *handle,
- sys::SmartScopedLock<true> &,
- bool isMainExec);
-
public:
explicit DynamicLibrary(void *data = &Invalid) : Data(data) {}
@@ -75,14 +68,6 @@ namespace sys {
static DynamicLibrary getPermanentLibrary(const char *filename,
std::string *errMsg = nullptr);
- /// Registers an externally loaded library. The library will be unloaded
- /// when the program terminates.
- ///
- /// It is safe to call this function multiple times for the same library.
- ///
- /// \returns An empty \p DynamicLibrary on failure.
- static DynamicLibrary addPermanentLibrary(void *handle);
-
/// This function permanently loads the dynamic library at the given path.
/// Use this instead of getPermanentLibrary() when you won't need to get
/// symbols from the library itself.
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp
index d3983fb4437..74d94d33d5a 100644
--- a/llvm/lib/Support/DynamicLibrary.cpp
+++ b/llvm/lib/Support/DynamicLibrary.cpp
@@ -68,34 +68,10 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
handle = RTLD_DEFAULT;
#endif
- DynamicLibrary dyLib = addPermanentLibraryWithLock(handle, lock, !filename);
-
// If we've already loaded this library, dlclose() the handle in order to
// keep the internal refcount at +1.
- if (!dyLib.isValid()) {
- if (errMsg)
- *errMsg = (filename) ? std::string(filename) : std::string() +
- ": Library already loaded";
+ if (!OpenedHandles->insert(handle).second)
dlclose(handle);
- }
-
- return dyLib;
-}
-
-DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle) {
- SmartScopedLock<true> lock(*SymbolsMutex);
- return addPermanentLibraryWithLock(handle, lock, false);
-}
-
-DynamicLibrary DynamicLibrary::addPermanentLibraryWithLock(void *handle,
- sys::SmartScopedLock<true> &,
- bool isMainExec) {
- // If we've already loaded this library, tell the caller.
- // FIXME: Note that multiple requests for adding the main executable is not
- // considered as an error. If we don't want to treat the main executable as a
- // special case we need to do a cleanup in the MCJIT tests and API.
- if (!OpenedHandles->insert(handle).second && !isMainExec)
- return DynamicLibrary();
return DynamicLibrary(handle);
}
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc
index 85685668fa1..87dde46de3c 100644
--- a/llvm/lib/Support/Windows/DynamicLibrary.inc
+++ b/llvm/lib/Support/Windows/DynamicLibrary.inc
@@ -9,6 +9,8 @@
//
// This file provides the Win32 specific implementation of DynamicLibrary.
//
+// FIXME: This file leaks OpenedHandles!
+//
//===----------------------------------------------------------------------===//
#include "WindowsSupport.h"
@@ -33,7 +35,7 @@ using namespace sys;
typedef BOOL (WINAPI *fpEnumerateLoadedModules)(HANDLE,PENUMLOADED_MODULES_CALLBACK64,PVOID);
static fpEnumerateLoadedModules fEnumerateLoadedModules;
-static llvm::ManagedStatic<DenseSet<HMODULE> > OpenedHandles;
+static DenseSet<HMODULE> *OpenedHandles;
static bool loadDebugHelp(void) {
HMODULE hLib = ::LoadLibraryW(L"Dbghelp.dll");
@@ -57,6 +59,9 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
if (!filename) {
// When no file is specified, enumerate all DLLs and EXEs in the process.
+ if (OpenedHandles == 0)
+ OpenedHandles = new DenseSet<HMODULE>();
+
if (!fEnumerateLoadedModules) {
if (!loadDebugHelp()) {
assert(false && "These APIs should always be available");
@@ -76,7 +81,7 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
MakeErrMsg(errMsg, std::string(filename) + ": Can't convert to UTF-16");
return DynamicLibrary();
}
-
+
HMODULE a_handle = LoadLibraryW(filenameUnicode.data());
if (a_handle == 0) {
@@ -84,33 +89,15 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
return DynamicLibrary();
}
- DynamicLibrary dyLib = addPermanentLibraryWithLock(a_handle, lock, !filename);
+ if (OpenedHandles == 0)
+ OpenedHandles = new DenseSet<HMODULE>();
+
// If we've already loaded this library, FreeLibrary() the handle in order to
// keep the internal refcount at +1.
- if (!dyLib.isValid()) {
- MakeErrMsg(errMsg, std::string(filename) + ": Already loaded");
+ if (!OpenedHandles->insert(a_handle).second)
FreeLibrary(a_handle);
- }
-
- return dyLib;
-}
-
-DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle) {
- SmartScopedLock<true> lock(*SymbolsMutex);
- return addPermanentLibraryWithLock(handle, lock, false);
-}
-
-DynamicLibrary DynamicLibrary::addPermanentLibraryWithLock(void *handle,
- sys::SmartScopedLock<true> &,
- bool isMainExec) {
- // If we've already loaded this library, tell the caller.
- // FIXME: Note that multiple requests for adding the main executable is not
- // considered as an error. If we don't want to treat the main executable as a
- // special case we need to do a cleanup in the MCJIT tests and API.
- if (!OpenedHandles->insert((const HMODULE)handle).second && !isMainExec)
- return DynamicLibrary();
- return DynamicLibrary((HMODULE)handle);
+ return DynamicLibrary(a_handle);
}
// Stack probing routines are in the support library (e.g. libgcc), but we don't
@@ -150,7 +137,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
}
// Now search the libraries.
- if (OpenedHandles.isConstructed()) {
+ if (OpenedHandles) {
for (DenseSet<HMODULE>::iterator I = OpenedHandles->begin(),
E = OpenedHandles->end(); I != E; ++I) {
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
OpenPOWER on IntegriCloud