llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Adrian Prantl (adrian-prantl) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/119022.diff 4 Files Affected: - (modified) lldb/include/lldb/Target/Platform.h (+32) - (modified) lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (+38) - (modified) lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.h (+6) - (modified) lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp (+7) ``````````diff diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index f8a2cbf0d5d049..2f954ed18bb830 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -473,6 +473,38 @@ class Platform : public PluginInterface { LLVM_PRETTY_FUNCTION, GetName())); } + /// Search CU for the SDK paths the CUs was compiled against. In the + /// presence of different SDKs, we try to pick the most appropriate + /// one using \ref XcodeSDK::Merge. + /// + /// \param[in] unit The CU + /// + /// \returns If successful, returns a pair of a parsed XcodeSDK + /// object and a boolean that is 'true' if we encountered + /// a conflicting combination of SDKs when parsing the CUs + /// (e.g., a public and internal SDK). + virtual llvm::Expected<std::pair<XcodeSDK, bool>> + GetSDKPathFromDebugInfo(CompileUnit &unit) { + return llvm::createStringError( + llvm::formatv("{0} not implemented for '{1}' platform.", + LLVM_PRETTY_FUNCTION, GetName())); + } + + /// Returns the full path of the most appropriate SDK for the + /// specified compile unit. This function gets this path by parsing + /// debug-info (see \ref `GetSDKPathFromDebugInfo`). + /// + /// \param[in] unit The CU to scan. + /// + /// \returns If successful, returns the full path to an + /// Xcode SDK. + virtual llvm::Expected<std::string> + ResolveSDKPathFromDebugInfo(CompileUnit &unit) { + return llvm::createStringError( + llvm::formatv("{0} not implemented for '{1}' platform.", + LLVM_PRETTY_FUNCTION, GetName())); + } + bool IsHost() const { return m_is_host; // Is this the default host platform? } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp index ed0c614cb3576b..90324e388dbf5e 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -29,6 +29,7 @@ #include "lldb/Interpreter/OptionValueProperties.h" #include "lldb/Interpreter/OptionValueString.h" #include "lldb/Interpreter/Options.h" +#include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/SymbolFile.h" #include "lldb/Symbol/SymbolVendor.h" @@ -1429,3 +1430,40 @@ PlatformDarwin::ResolveSDKPathFromDebugInfo(Module &module) { return path_or_err->str(); } + +llvm::Expected<std::pair<XcodeSDK, bool>> +PlatformDarwin::GetSDKPathFromDebugInfo(CompileUnit &unit) { + ModuleSP module_sp = unit.CalculateSymbolContextModule(); + if (!module_sp) + return llvm::createStringError("compile unit has no module"); + SymbolFile *sym_file = module_sp->GetSymbolFile(); + if (!sym_file) + return llvm::createStringError( + llvm::formatv("No symbol file available for module '{0}'", + module_sp->GetFileSpec().GetFilename())); + + const bool found_mismatch = false; + return std::pair{sym_file->ParseXcodeSDK(unit), found_mismatch}; +} + +llvm::Expected<std::string> +PlatformDarwin::ResolveSDKPathFromDebugInfo(CompileUnit &unit) { + auto sdk_or_err = GetSDKPathFromDebugInfo(unit); + if (!sdk_or_err) + return llvm::createStringError( + llvm::inconvertibleErrorCode(), + llvm::formatv("Failed to parse SDK path from debug-info: {0}", + llvm::toString(sdk_or_err.takeError()))); + + auto [sdk, _] = std::move(*sdk_or_err); + + auto path_or_err = HostInfo::GetSDKRoot(HostInfo::SDKOptions{sdk}); + if (!path_or_err) + return llvm::createStringError( + llvm::inconvertibleErrorCode(), + llvm::formatv("Error while searching for SDK (XcodeSDK '{0}'): {1}", + sdk.GetString(), + llvm::toString(path_or_err.takeError()))); + + return path_or_err->str(); +} diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.h b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.h index 66a26d2f496776..157709424893c2 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.h @@ -130,6 +130,12 @@ class PlatformDarwin : public PlatformPOSIX { llvm::Expected<std::string> ResolveSDKPathFromDebugInfo(Module &module) override; + llvm::Expected<std::pair<XcodeSDK, bool>> + GetSDKPathFromDebugInfo(CompileUnit &unit) override; + + llvm::Expected<std::string> + ResolveSDKPathFromDebugInfo(CompileUnit &unit) override; + protected: static const char *GetCompatibleArch(ArchSpec::Core core, size_t idx); diff --git a/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp b/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp index f1998a92f19b05..fc008ca7011e44 100644 --- a/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp @@ -268,6 +268,13 @@ TEST_P(SDKPathParsingMultiparamTests, TestSDKPathFromDebugInfo) { EXPECT_EQ(found_mismatch, expect_mismatch); EXPECT_EQ(sdk.IsAppleInternalSDK(), expect_internal_sdk); EXPECT_NE(sdk.GetString().find(expect_sdk_path_pattern), std::string::npos); + + { + auto sdk_or_err = + platform_sp->GetSDKPathFromDebugInfo(*dwarf_cu->GetLLDBCompUnit()); + ASSERT_TRUE(static_cast<bool>(sdk_or_err)); + EXPECT_EQ(sdk.IsAppleInternalSDK(), expect_internal_sdk); + } } SDKPathParsingTestData sdkPathParsingTestCases[] = { `````````` </details> https://github.com/llvm/llvm-project/pull/119022 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
