mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-22 12:33:33 +02:00
Revert r296442 (and r296443), "Allow externally dlopen-ed libraries to be registered as permanent libraries."
It broke clang/test/Analysis/checker-plugins.c llvm-svn: 296463
This commit is contained in:
parent
7cb8f6733d
commit
ccf0e89448
@ -14,8 +14,6 @@
|
|||||||
#ifndef LLVM_SUPPORT_DYNAMICLIBRARY_H
|
#ifndef LLVM_SUPPORT_DYNAMICLIBRARY_H
|
||||||
#define LLVM_SUPPORT_DYNAMICLIBRARY_H
|
#define LLVM_SUPPORT_DYNAMICLIBRARY_H
|
||||||
|
|
||||||
#include "llvm/Support/Mutex.h"
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace llvm {
|
namespace llvm {
|
||||||
@ -45,11 +43,6 @@ namespace sys {
|
|||||||
// Opaque data used to interface with OS-specific dynamic library handling.
|
// Opaque data used to interface with OS-specific dynamic library handling.
|
||||||
void *Data;
|
void *Data;
|
||||||
|
|
||||||
// Adds a opened library handle to the list of OpenedHandles.
|
|
||||||
static DynamicLibrary addPermanentLibraryWithLock(void *handle,
|
|
||||||
sys::SmartScopedLock<true> &,
|
|
||||||
bool isMainExec);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit DynamicLibrary(void *data = &Invalid) : Data(data) {}
|
explicit DynamicLibrary(void *data = &Invalid) : Data(data) {}
|
||||||
|
|
||||||
@ -75,14 +68,6 @@ namespace sys {
|
|||||||
static DynamicLibrary getPermanentLibrary(const char *filename,
|
static DynamicLibrary getPermanentLibrary(const char *filename,
|
||||||
std::string *errMsg = nullptr);
|
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.
|
/// This function permanently loads the dynamic library at the given path.
|
||||||
/// Use this instead of getPermanentLibrary() when you won't need to get
|
/// Use this instead of getPermanentLibrary() when you won't need to get
|
||||||
/// symbols from the library itself.
|
/// symbols from the library itself.
|
||||||
|
@ -68,34 +68,10 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
|||||||
handle = RTLD_DEFAULT;
|
handle = RTLD_DEFAULT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DynamicLibrary dyLib = addPermanentLibraryWithLock(handle, lock, !filename);
|
|
||||||
|
|
||||||
// If we've already loaded this library, dlclose() the handle in order to
|
// If we've already loaded this library, dlclose() the handle in order to
|
||||||
// keep the internal refcount at +1.
|
// keep the internal refcount at +1.
|
||||||
if (!dyLib.isValid()) {
|
if (!OpenedHandles->insert(handle).second)
|
||||||
if (errMsg)
|
|
||||||
*errMsg = (filename) ? std::string(filename) : std::string() +
|
|
||||||
": Library already loaded";
|
|
||||||
dlclose(handle);
|
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);
|
return DynamicLibrary(handle);
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,8 @@
|
|||||||
//
|
//
|
||||||
// This file provides the Win32 specific implementation of DynamicLibrary.
|
// This file provides the Win32 specific implementation of DynamicLibrary.
|
||||||
//
|
//
|
||||||
|
// FIXME: This file leaks OpenedHandles!
|
||||||
|
//
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "WindowsSupport.h"
|
#include "WindowsSupport.h"
|
||||||
@ -33,7 +35,7 @@ using namespace sys;
|
|||||||
|
|
||||||
typedef BOOL (WINAPI *fpEnumerateLoadedModules)(HANDLE,PENUMLOADED_MODULES_CALLBACK64,PVOID);
|
typedef BOOL (WINAPI *fpEnumerateLoadedModules)(HANDLE,PENUMLOADED_MODULES_CALLBACK64,PVOID);
|
||||||
static fpEnumerateLoadedModules fEnumerateLoadedModules;
|
static fpEnumerateLoadedModules fEnumerateLoadedModules;
|
||||||
static llvm::ManagedStatic<DenseSet<HMODULE> > OpenedHandles;
|
static DenseSet<HMODULE> *OpenedHandles;
|
||||||
|
|
||||||
static bool loadDebugHelp(void) {
|
static bool loadDebugHelp(void) {
|
||||||
HMODULE hLib = ::LoadLibraryW(L"Dbghelp.dll");
|
HMODULE hLib = ::LoadLibraryW(L"Dbghelp.dll");
|
||||||
@ -57,6 +59,9 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
|||||||
|
|
||||||
if (!filename) {
|
if (!filename) {
|
||||||
// When no file is specified, enumerate all DLLs and EXEs in the process.
|
// When no file is specified, enumerate all DLLs and EXEs in the process.
|
||||||
|
if (OpenedHandles == 0)
|
||||||
|
OpenedHandles = new DenseSet<HMODULE>();
|
||||||
|
|
||||||
if (!fEnumerateLoadedModules) {
|
if (!fEnumerateLoadedModules) {
|
||||||
if (!loadDebugHelp()) {
|
if (!loadDebugHelp()) {
|
||||||
assert(false && "These APIs should always be available");
|
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");
|
MakeErrMsg(errMsg, std::string(filename) + ": Can't convert to UTF-16");
|
||||||
return DynamicLibrary();
|
return DynamicLibrary();
|
||||||
}
|
}
|
||||||
|
|
||||||
HMODULE a_handle = LoadLibraryW(filenameUnicode.data());
|
HMODULE a_handle = LoadLibraryW(filenameUnicode.data());
|
||||||
|
|
||||||
if (a_handle == 0) {
|
if (a_handle == 0) {
|
||||||
@ -84,33 +89,15 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
|||||||
return DynamicLibrary();
|
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
|
// If we've already loaded this library, FreeLibrary() the handle in order to
|
||||||
// keep the internal refcount at +1.
|
// keep the internal refcount at +1.
|
||||||
if (!dyLib.isValid()) {
|
if (!OpenedHandles->insert(a_handle).second)
|
||||||
MakeErrMsg(errMsg, std::string(filename) + ": Already loaded");
|
|
||||||
FreeLibrary(a_handle);
|
FreeLibrary(a_handle);
|
||||||
}
|
|
||||||
|
|
||||||
return dyLib;
|
return DynamicLibrary(a_handle);
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stack probing routines are in the support library (e.g. libgcc), but we don't
|
// 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.
|
// Now search the libraries.
|
||||||
if (OpenedHandles.isConstructed()) {
|
if (OpenedHandles) {
|
||||||
for (DenseSet<HMODULE>::iterator I = OpenedHandles->begin(),
|
for (DenseSet<HMODULE>::iterator I = OpenedHandles->begin(),
|
||||||
E = OpenedHandles->end(); I != E; ++I) {
|
E = OpenedHandles->end(); I != E; ++I) {
|
||||||
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
|
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
|
||||||
|
Loading…
Reference in New Issue
Block a user