mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-16 16:56:35 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
The `DW_AT_APPLE_sdk` should always be equal to the filename of the
`DW_AT_LLVM_sysroot`. We can use this property to simplify
`XcodeSDK::Merge` to no longer manually adjust the sysroot filename.
Instead we simply update the sysroot filename with merged SDK name.

This should be an NFC change.
This commit is contained in:
Michael Buch 2025-03-11 08:13:05 +00:00 committed by GitHub
parent 7ecb0d03a4
commit cdd560eead
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/include/lldb/Utility/XcodeSDK.h
View File

@ -65,7 +65,9 @@ public:
/// 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:

14
lldb/source/Utility/XcodeSDK.cpp
View File

@ -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();
@ -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) {

11
lldb/unittests/Utility/XcodeSDKTest.cpp
View File

@ -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