dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Use dlopen for loading AOT snapshots on Fuchsia.

Browse Source 
This will play better with native tooling compared to Dart_LoadELF.

Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-arm64-try,vm-fuchsia-release-x64-try
Change-Id: If5265d079200d7be754b82a9775d977aa66c15f9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419684
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Zijie He <zijiehe@google.com>
This commit is contained in:
Ryan Macnak
2025-04-02 12:46:55 -07:00
committed by Commit Queue
parent a94645962e
commit 383cd496ce
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/platform/utils.cc
+30 -1
View File
@@ -8,8 +8,15 @@
#include "platform/globals.h"
#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) || \
defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
defined(DART_HOST_OS_ANDROID)
#include <dlfcn.h>
#elif defined(DART_HOST_OS_FUCHSIA)
#include <dlfcn.h>
#include <fuchsia/io/cpp/fidl.h>
#include <lib/fdio/directory.h>
#include <lib/fdio/io.h>
#include <zircon/dlfcn.h>
#include <zircon/status.h>
#endif
namespace dart {
@@ -294,6 +301,28 @@ void* Utils::LoadDynamicLibrary(const char* library_path,
#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) || \
defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
handle = dlopen(library_path, RTLD_LAZY);
#if defined(DART_HOST_OS_FUCHSIA)
if (handle == nullptr) {
// Fuchsia's search path is different.
// https://fuchsia.dev/fuchsia-src/concepts/process/program_loading#zircons_standard_elf_dynamic_linker
fuchsia::io::Flags flags =
fuchsia::io::PERM_READABLE | fuchsia::io::PERM_EXECUTABLE;
int fd = -1;
zx_status_t status = fdio_open3_fd(library_path, uint64_t{flags}, &fd);
if (status != ZX_OK) {
*error = strdup(zx_status_get_string(status));
return nullptr;
}
zx_handle_t vmo = ZX_HANDLE_INVALID;
status = fdio_get_vmo_exec(fd, &vmo);
close(fd);
if (status != ZX_OK) {
*error = strdup(zx_status_get_string(status));
return nullptr;
}
handle = dlopen_vmo(vmo, RTLD_LAZY);
}
#endif // defined(DART_HOST_OS_FUCHSIA)
#elif defined(DART_HOST_OS_WINDOWS)
SetLastError(0); // Clear any errors.