fixup! make sysroot member a FileSpec

Author: Michael137

lldb/include/lldb/Utility/XcodeSDK.h

@@ -9,6 +9,7 @@
 #ifndef LLDB_UTILITY_SDK_H
 #define LLDB_UTILITY_SDK_H
 
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/lldb-forward.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/VersionTuple.h"
@@ -23,8 +24,7 @@ namespace lldb_private {
 /// An abstraction for Xcode-style SDKs that works like \ref ArchSpec.
 class XcodeSDK {
   std::string m_name;
-  std::optional<std::string>
-      m_sysroot_path; // TODO: should this be std::optional<FileSpec>?
+  FileSpec m_sysroot;
 
 public:
   /// Different types of Xcode SDKs.
@@ -64,8 +64,8 @@ class XcodeSDK {
   /// directory component of a path one would pass to clang's -isysroot
   /// parameter. For example, "MacOSX.10.14.sdk".
   XcodeSDK(std::string &&name) : m_name(std::move(name)) {}
-  XcodeSDK(std::string name, std::string sysroot)
-      : m_name(std::move(name)), m_sysroot_path(std::move(sysroot)) {}
+  XcodeSDK(std::string name, FileSpec sysroot)
+      : m_name(std::move(name)), m_sysroot(std::move(sysroot)) {}
   static XcodeSDK GetAnyMacOS() { return XcodeSDK("MacOSX.sdk"); }
 
   /// The merge function follows a strict order to maintain monotonicity:
@@ -83,7 +83,7 @@ class XcodeSDK {
   llvm::VersionTuple GetVersion() const;
   Type GetType() const;
   llvm::StringRef GetString() const;
-  std::optional<llvm::StringRef> GetSysroot() const;
+  const FileSpec &GetSysroot() const;
   /// Whether this Xcode SDK supports Swift.
   bool SupportsSwift() const;
 

lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp

@@ -79,14 +79,6 @@ static Status ExceptionMaskValidator(const char *string, void *unused) {
   return {};
 }
 
-static bool XcodeSysrootExists(XcodeSDK const &sdk) {
-  auto maybe_sysroot = sdk.GetSysroot();
-  if (!maybe_sysroot)
-    return false;
-
-  return FileSystem::Instance().Exists(*maybe_sysroot);
-}
-
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
@@ -1434,8 +1426,8 @@ PlatformDarwin::ResolveSDKPathFromDebugInfo(Module &module) {
 
   auto [sdk, _] = std::move(*sdk_or_err);
 
-  if (XcodeSysrootExists(sdk))
-    return sdk.GetSysroot()->str();
+  if (FileSystem::Instance().Exists(sdk.GetSysroot()))
+    return sdk.GetSysroot().GetPath();
 
   auto path_or_err = HostInfo::GetSDKRoot(HostInfo::SDKOptions{sdk});
   if (!path_or_err)

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -1012,7 +1012,7 @@ XcodeSDK SymbolFileDWARF::ParseXcodeSDK(CompileUnit &comp_unit) {
       local_module_sp->RegisterXcodeSDK(sdk, sysroot);
   }
 
-  return {sdk, std::move(sysroot)};
+  return {sdk, FileSpec{std::move(sysroot)}};
 }
 
 size_t SymbolFileDWARF::ParseFunctions(CompileUnit &comp_unit) {

lldb/source/Utility/XcodeSDK.cpp

@@ -142,9 +142,7 @@ XcodeSDK::Type XcodeSDK::GetType() const {
 
 llvm::StringRef XcodeSDK::GetString() const { return m_name; }
 
-std::optional<llvm::StringRef> XcodeSDK::GetSysroot() const {
-  return m_sysroot_path;
-}
+const FileSpec &XcodeSDK::GetSysroot() const { return m_sysroot; }
 
 bool XcodeSDK::Info::operator<(const Info &other) const {
   return std::tie(type, version, internal) <
@@ -157,8 +155,8 @@ bool XcodeSDK::Info::operator==(const Info &other) const {
 }
 
 void XcodeSDK::Merge(const XcodeSDK &other) {
-  auto add_internal_sdk_suffix = [](std::string const &sdk) {
-    return sdk.substr(0, sdk.size() - 3) + "Internal.sdk";
+  auto add_internal_sdk_suffix = [](llvm::StringRef sdk) {
+    return (sdk.substr(0, sdk.size() - 3) + "Internal.sdk").str();
   };
 
   // The "bigger" SDK always wins.
@@ -172,8 +170,8 @@ void XcodeSDK::Merge(const XcodeSDK &other) {
       if (llvm::StringRef(m_name).ends_with(".sdk"))
         m_name = add_internal_sdk_suffix(m_name);
 
-      if (m_sysroot_path && llvm::StringRef(*m_sysroot_path).ends_with(".sdk"))
-        m_sysroot_path.emplace(add_internal_sdk_suffix(*m_sysroot_path));
+      if (m_sysroot.GetFileNameExtension() == ".sdk")
+        m_sysroot.SetFilename(add_internal_sdk_suffix(m_sysroot.GetFilename()));
     }
   }
 }

lldb/unittests/Utility/XcodeSDKTest.cpp

@@ -34,16 +34,17 @@ TEST(XcodeSDKTest, ParseTest) {
   EXPECT_EQ(XcodeSDK("MacOSX10.9.sdk").GetVersion(), llvm::VersionTuple(10, 9));
   EXPECT_EQ(XcodeSDK("MacOSX10.15.4.sdk").GetVersion(), llvm::VersionTuple(10, 15));
   EXPECT_EQ(XcodeSDK("MacOSX.sdk").IsAppleInternalSDK(), false);
-  EXPECT_EQ(XcodeSDK("MacOSX.sdk", "/Path/To/MacOSX.sdk").GetSysroot(),
-            "/Path/To/MacOSX.sdk");
+  EXPECT_EQ(
+      XcodeSDK("MacOSX.sdk", FileSpec{"/Path/To/MacOSX.sdk"}).GetSysroot(),
+      FileSpec("/Path/To/MacOSX.sdk"));
   EXPECT_EQ(XcodeSDK("MacOSX10.15.Internal.sdk").GetType(), XcodeSDK::MacOSX);
   EXPECT_EQ(XcodeSDK("MacOSX10.15.Internal.sdk").GetVersion(),
             llvm::VersionTuple(10, 15));
   EXPECT_EQ(XcodeSDK("MacOSX10.15.Internal.sdk").IsAppleInternalSDK(), true);
-  EXPECT_EQ(XcodeSDK("MacOSX10.15.Internal.sdk").GetSysroot(), std::nullopt);
+  EXPECT_FALSE(XcodeSDK("MacOSX10.15.Internal.sdk").GetSysroot());
   EXPECT_EQ(XcodeSDK().GetType(), XcodeSDK::unknown);
   EXPECT_EQ(XcodeSDK().GetVersion(), llvm::VersionTuple());
-  EXPECT_EQ(XcodeSDK().GetSysroot(), std::nullopt);
+  EXPECT_FALSE(XcodeSDK().GetSysroot());
 }
 
 TEST(XcodeSDKTest, MergeTest) {
@@ -64,14 +65,14 @@ TEST(XcodeSDKTest, MergeTest) {
   XcodeSDK empty;
   empty.Merge(XcodeSDK("MacOSX10.14.Internal.sdk"));
   EXPECT_EQ(empty.GetString(), llvm::StringRef("MacOSX10.14.Internal.sdk"));
-  EXPECT_EQ(empty.GetSysroot(), std::nullopt);
-  empty.Merge(XcodeSDK("MacOSX9.5.Internal.sdk", "/Path/To/9.5.sdk"));
-  EXPECT_EQ(empty.GetSysroot(), std::nullopt);
-  empty.Merge(XcodeSDK("MacOSX12.5.sdk", "/Path/To/12.5.sdk"));
-  EXPECT_EQ(empty.GetSysroot(), "/Path/To/12.5.sdk");
-  empty.Merge(
-      XcodeSDK("MacOSX11.5.Internal.sdk", "/Path/To/12.5.Internal.sdk"));
-  EXPECT_EQ(empty.GetSysroot(), "/Path/To/12.5.Internal.sdk");
+  EXPECT_FALSE(empty.GetSysroot());
+  empty.Merge(XcodeSDK("MacOSX9.5.Internal.sdk", FileSpec{"/Path/To/9.5.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("MacOSX11.5.Internal.sdk",
+                       FileSpec{"/Path/To/12.5.Internal.sdk"}));
+  EXPECT_EQ(empty.GetSysroot(), FileSpec{"/Path/To/12.5.Internal.sdk"});
 }
 
 #ifndef _WIN32