intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-20 10:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Support][Cygwin] Fix handling of Process symbol lookup. (#143072)

Browse Source 
In Unix/DynamicLibrary.inc, it was already known that Cygwin required
use of `RTLD_DEFAULT` as the `Handle` parameter to `DLSym` to search all
modules for a symbol. Unfortunately, RTLD_DEFAULT is defined as NULL, so
the existing checks of the `Process` handle meant `DLSym` would never be
called on Cygwin. Use the existing `&Invalid` sentinel instead of
`nullptr` for the `Process` handle.
This commit is contained in:
jeremyd2019
2025-06-09 12:19:37 -07:00
committed by GitHub
parent e7739eb6cc
commit d659364295
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Support/DynamicLibrary.cpp
View File

@@ -25,7 +25,7 @@ using namespace llvm::sys;
class DynamicLibrary::HandleSet {
typedef std::vector<void *> HandleList;
HandleList Handles;
void *Process = nullptr;
void *Process = &Invalid;
public:
static void *DLOpen(const char *Filename, std::string *Err);
@@ -58,7 +58,7 @@ public:
Handles.push_back(Handle);
} else {
#ifndef _WIN32
if (Process) {
if (Process != &Invalid) {
if (CanClose)
DLClose(Process);
if (Process == Handle)
@@ -97,11 +97,11 @@ public:
assert(!((Order & SO_LoadedFirst) && (Order & SO_LoadedLast)) &&
"Invalid Ordering");
if (!Process || (Order & SO_LoadedFirst)) {
if (Process == &Invalid || (Order & SO_LoadedFirst)) {
if (void *Ptr = LibLookup(Symbol, Order))
return Ptr;
}
if (Process) {
if (Process != &Invalid) {
// Use OS facilities to search the current binary and all loaded libs.
if (void *Ptr = DLSym(Process, Symbol))
return Ptr;

2
llvm/lib/Support/Unix/DynamicLibrary.inc
View File

@@ -17,7 +17,7 @@ DynamicLibrary::HandleSet::~HandleSet() {
// Close the libraries in reverse order.
for (void *Handle : llvm::reverse(Handles))
::dlclose(Handle);
if (Process)
if (Process != &Invalid)
::dlclose(Process);
// llvm_shutdown called, Return to default

6
llvm/lib/Support/Windows/DynamicLibrary.inc
View File

@@ -26,7 +26,7 @@ DynamicLibrary::HandleSet::~HandleSet() {
FreeLibrary(HMODULE(Handle));
// 'Process' should not be released on Windows.
assert((!Process || Process == this) && "Bad Handle");
assert((Process == &Invalid || Process == this) && "Bad Handle");
// llvm_shutdown called, Return to default
DynamicLibrary::SearchOrder = DynamicLibrary::SO_Linker;
}
@@ -60,7 +60,7 @@ static DynamicLibrary::HandleSet *IsOpenedHandlesInstance(void *Handle) {
void DynamicLibrary::HandleSet::DLClose(void *Handle) {
if (HandleSet *HS = IsOpenedHandlesInstance(Handle))
HS->Process = nullptr; // Just drop the *Process* handle.
HS->Process = &Invalid; // Just drop the *Process* handle.
else
FreeLibrary((HMODULE)Handle);
}
@@ -89,7 +89,7 @@ void *DynamicLibrary::HandleSet::DLSym(void *Handle, const char *Symbol) {
return (void *)uintptr_t(GetProcAddress((HMODULE)Handle, Symbol));
// Could have done a dlclose on the *Process* handle
if (!HS->Process)
if (HS->Process == &Invalid)
return nullptr;
// Trials indicate EnumProcessModulesEx is consistantly faster than using