Swift: adjust for API changes

compnerd · bulbazord · commit c5689f1aa690 · 2023-08-09T13:17:21.000-07:00
Update the Swift type system plugin for the changed API to enable the necessary support for Windows. (cherry picked from commit 4bfbcfb) (cherry picked from commit d14719e)
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -1716,7 +1716,7 @@ static llvm::Optional<StringRef> GetDSYMBundle(Module &module) {
 }
 
 static std::string GetSDKPath(std::string m_description, XcodeSDK sdk) {
-  auto sdk_path_or_err = HostInfo::GetXcodeSDKPath(sdk);
+  auto sdk_path_or_err = HostInfo::GetSDKRoot(HostInfo::SDKOptions{sdk});
   if (!sdk_path_or_err) {
     Debugger::ReportError("Error while searching for SDK: " +
                           toString(sdk_path_or_err.takeError()));

Original file line number	Diff line number	Diff line change
`@@ -1716,7 +1716,7 @@ static llvm::Optional<StringRef> GetDSYMBundle(Module &module) {`
`1716`	`1716`	`}`
`1717`	`1717`
`1718`	`1718`	`static std::string GetSDKPath(std::string m_description, XcodeSDK sdk) {`
`1719`		`- auto sdk_path_or_err = HostInfo::GetXcodeSDKPath(sdk);`
	`1719`	`+ auto sdk_path_or_err = HostInfo::GetSDKRoot(HostInfo::SDKOptions{sdk});`
`1720`	`1720`	`if (!sdk_path_or_err) {`
`1721`	`1721`	`Debugger::ReportError("Error while searching for SDK: " +`
`1722`	`1722`	`toString(sdk_path_or_err.takeError()));`