Skip to content

[lldb][XcodeSDK] Simplify logic that adjusts sysroot during XcodeSDK merging #130640

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
Mar 11, 2025
Merged

[lldb][XcodeSDK] Simplify logic that adjusts sysroot during XcodeSDK merging #130640

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
4 changes: 3 additions & 1 deletion lldb/include/lldb/Utility/XcodeSDK.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ class XcodeSDK {
/// parameter. For example, "MacOSX.10.14.sdk".
XcodeSDK(std::string &&name) : m_name(std::move(name)) {}
XcodeSDK(std::string name, FileSpec sysroot)
: m_name(std::move(name)), m_sysroot(std::move(sysroot)) {}
: m_name(std::move(name)), m_sysroot(std::move(sysroot)) {
assert(!m_sysroot || m_name == m_sysroot.GetFilename().GetStringRef());
}
static XcodeSDK GetAnyMacOS() { return XcodeSDK("MacOSX.sdk"); }

/// The merge function follows a strict order to maintain monotonicity:
Expand Down
14 changes: 6 additions & 8 deletions lldb/source/Utility/XcodeSDK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,6 @@ bool XcodeSDK::Info::operator==(const Info &other) const {
}

void XcodeSDK::Merge(const XcodeSDK &other) {
auto add_internal_sdk_suffix = [](llvm::StringRef sdk) {
return (sdk.substr(0, sdk.size() - 3) + "Internal.sdk").str();
};

// The "bigger" SDK always wins.
auto l = Parse();
auto r = other.Parse();
Expand All @@ -168,12 +164,14 @@ void XcodeSDK::Merge(const XcodeSDK &other) {
// The Internal flag always wins.
if (!l.internal && r.internal) {
if (llvm::StringRef(m_name).ends_with(".sdk"))
m_name = add_internal_sdk_suffix(m_name);

if (m_sysroot.GetFileNameExtension() == ".sdk")
m_sysroot.SetFilename(add_internal_sdk_suffix(m_sysroot.GetFilename()));
m_name =
m_name.substr(0, m_name.size() - 3) + std::string("Internal.sdk");
}
}

// We changed the SDK name. Adjust the sysroot accordingly.
if (m_sysroot && m_sysroot.GetFilename().GetStringRef() != m_name)
m_sysroot.SetFilename(m_name);
}

std::string XcodeSDK::GetCanonicalName(XcodeSDK::Info info) {
Expand Down
11 changes: 6 additions & 5 deletions lldb/unittests/Utility/XcodeSDKTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@ TEST(XcodeSDKTest, MergeTest) {
empty.Merge(XcodeSDK("MacOSX10.14.Internal.sdk"));
EXPECT_EQ(empty.GetString(), llvm::StringRef("MacOSX10.14.Internal.sdk"));
EXPECT_FALSE(empty.GetSysroot());
empty.Merge(XcodeSDK("MacOSX9.5.Internal.sdk", FileSpec{"/Path/To/9.5.sdk"}));
empty.Merge(XcodeSDK("MacOSX9.5.Internal.sdk",
FileSpec{"/Path/To/MacOSX9.5.Internal.sdk"}));
EXPECT_FALSE(empty.GetSysroot());
empty.Merge(XcodeSDK("MacOSX12.5.sdk", FileSpec{"/Path/To/12.5.sdk"}));
EXPECT_EQ(empty.GetSysroot(), FileSpec{"/Path/To/12.5.sdk"});
empty.Merge(XcodeSDK("MacOSX12.5.sdk", FileSpec{"/Path/To/MacOSX12.5.sdk"}));
EXPECT_EQ(empty.GetSysroot(), FileSpec{"/Path/To/MacOSX12.5.sdk"});
empty.Merge(XcodeSDK("MacOSX11.5.Internal.sdk",
FileSpec{"/Path/To/12.5.Internal.sdk"}));
EXPECT_EQ(empty.GetSysroot(), FileSpec{"/Path/To/12.5.Internal.sdk"});
FileSpec{"/Path/To/MacOSX11.5.Internal.sdk"}));
EXPECT_EQ(empty.GetSysroot(), FileSpec{"/Path/To/MacOSX12.5.Internal.sdk"});
}

#ifndef _WIN32
Expand Down