Skip to content

[Cherry-pick into stable/21.x] [LLDB] Update macOS Swift resource directory computation #11393

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
merged 1 commit into from
Sep 12, 2025
+59 −10
Merged

[Cherry-pick into stable/21.x] [LLDB] Update macOS Swift resource directory computation #11393

Show file tree
Hide file tree
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
49 changes: 39 additions & 10 deletions lldb/source/Host/macosx/objcxx/HostInfoMacOSXSwift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,46 @@ bool HostInfoMacOSX::ComputeSwiftResourceDirectory(FileSpec &lldb_shlib_spec,
if (!lldb_shlib_spec)
return false;

std::string raw_path = lldb_shlib_spec.GetPath();
size_t framework_pos = raw_path.find("LLDB.framework");
if (framework_pos == std::string::npos)
std::string shlib_path = lldb_shlib_spec.GetPath();
std::string resource_dir;

llvm::StringRef path(shlib_path);
// "LLDB.framework/Versions/A/LLDB" -> "LLDB.framework"
while (!path.empty() && llvm::sys::path::filename(path) != "LLDB.framework")
path = llvm::sys::path::parent_path(path);
// POSIX-style install.
if (path.empty() || llvm::sys::path::filename(path) != "LLDB.framework")
return HostInfoPosix::ComputeSwiftResourceDirectory(lldb_shlib_spec,
file_spec, verify);

framework_pos += strlen("LLDB.framework");
raw_path.resize(framework_pos);
raw_path.append("/Resources/Swift");
if (!verify || VerifySwiftPath(raw_path)) {
file_spec.SetDirectory(raw_path);
file_spec, verify);

assert(llvm::sys::path::filename(path) == "LLDB.framework");
path = llvm::sys::path::parent_path(path);
if (llvm::sys::path::filename(path) == "PrivateFrameworks") {
// Toolchain:
// Xcode.app/Contents/Developer/Toolchains/OSX26.0.xctoolchain/System/Library/PrivateFrameworks/LLDB.framework
// Xcode.app/Contents/Developer/Toolchains/OSX26.0.xctoolchain/usr/lib/swift
path = llvm::sys::path::parent_path(path);
if (llvm::sys::path::filename(path) != "Library")
return {};
path = llvm::sys::path::parent_path(path);
if (llvm::sys::path::filename(path) != "System")
return {};
path = llvm::sys::path::parent_path(path);
resource_dir = std::string(path) + "/usr/lib/swift";
} else if (llvm::sys::path::filename(path) == "SharedFrameworks") {
// Xcode:
// Xcode.app/Contents/SharedFrameworks/LLDB.framework
// Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
path = llvm::sys::path::parent_path(path);
resource_dir =
std::string(path) +
"/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift";
} else {
// Local build: LLDB.framework
resource_dir = std::string(path) + "/LLDB.framework/Resources/Swift";
}
if (!verify || VerifySwiftPath(resource_dir)) {
file_spec.SetDirectory(resource_dir);
FileSystem::Instance().Resolve(file_spec);
return true;
}
Expand Down
20 changes: 20 additions & 0 deletions lldb/unittests/Host/HostInfoSwiftTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,26 @@ TEST_F(SwiftHostTest, ComputeSwiftResourceDirectory) {
}

#if defined(__APPLE__)
TEST_F(SwiftHostTest, MacOSXToolchain) {
std::string path_to_liblldb =
"/Applications/Xcode.app/Contents/Developer/Toolchains/"
"OSX26.0.xctoolchain/System/Library/PrivateFrameworks/LLDB.framework";
std::string path_to_swift_dir =
"/Applications/Xcode.app/Contents/Developer/Toolchains/"
"OSX26.0.xctoolchain/usr/lib/swift";
EXPECT_EQ(ComputeSwiftResourceDirectoryHelper(path_to_liblldb),
path_to_swift_dir);
}
TEST_F(SwiftHostTest, MacOSXXcode) {
std::string path_to_liblldb =
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework";
std::string path_to_swift_dir =
"/Applications/Xcode.app/Contents/Developer/Toolchains/"
"XcodeDefault.xctoolchain/usr/lib/swift";
EXPECT_EQ(ComputeSwiftResourceDirectoryHelper(path_to_liblldb),
path_to_swift_dir);
}

TEST_F(SwiftHostTest, MacOSX) {
// test for LLDB.framework
std::string path_to_liblldb = "/foo/bar/lib/LLDB.framework";
Expand Down