Skip to content

[Runtime] Use dyld to find the image path when possible. #74891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
al45tair merged 1 commit into from
Jul 4, 2024
+14 −2
Merged

[Runtime] Use dyld to find the image path when possible. #74891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions stdlib/public/runtime/Paths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#endif

#if !defined(_WIN32) || defined(__CYGWIN__)

#if __has_include(<sys/stat.h>)
# include <sys/stat.h>

Expand All @@ -42,12 +43,21 @@
#include <dlfcn.h>
#endif

#if __has_include(<mach-o/dyld_priv.h>)
#include <mach-o/dyld_priv.h>
#define APPLE_OS_SYSTEM 1
#else
#define APPLE_OS_SYSTEM 0
#endif

#else // defined(_WIN32)

#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
#include <windows.h>
#include <psapi.h>
#endif

#endif // defined(_WIN32)

#ifdef __linux__
// Needed for 'readlink'.
Expand Down Expand Up @@ -524,7 +534,9 @@ _swift_initRuntimePath(void *) {
#if APPLE_OS_SYSTEM
const char *path = dyld_image_path_containing_address(_swift_initRuntimePath);

runtimePath = ::strdup(path);
// No need to ::strdup() this, as the return value is guaranteed to remain
// valid as long as the library is loaded.
runtimePath = path;
#elif SWIFT_STDLIB_HAS_DLADDR
Dl_info dli;
int ret = ::dladdr((void *)_swift_initRuntimePath, &dli);
Expand Down