Merge commit '092327f32947' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -995,6 +995,20 @@ SwiftASTContext::SwiftASTContext(std::string description,
       GetClangModulesCacheProperty());
 }
 
+static std::string DerivePlatformPluginPath(StringRef sdk_path) {
+  llvm::StringRef path = sdk_path;
+  path = llvm::sys::path::parent_path(path);
+  if (llvm::sys::path::filename(path) != "SDKs")
+    return {};
+  path = llvm::sys::path::parent_path(path);
+  if (llvm::sys::path::filename(path) != "Developer")
+    return {};
+  path = llvm::sys::path::parent_path(path);
+  if (!path.ends_with(".platform"))
+    return {};
+  return std::string(path) + "/usr/local/lib/swift/host/plugins";
+}
+
 void SwiftASTContext::SetCompilerInvocationLLDBOverrides() {
   swift::IRGenOptions &ir_gen_opts =
       m_compiler_invocation_ap->getIRGenOptions();
@@ -1018,6 +1032,20 @@ void SwiftASTContext::SetCompilerInvocationLLDBOverrides() {
   // Bypass deserialization safety to allow deserializing internal details from
   // swiftmodule files.
   lang_opts.EnableDeserializationSafety = false;
+
+  // Platform plugin path (macOS hosts only).
+  swift::PluginSearchOption::ExternalPluginPath platform_plugins;
+  platform_plugins.SearchPath =
+      DerivePlatformPluginPath(m_compiler_invocation_ap->getSDKPath());
+  if (!platform_plugins.SearchPath.empty()) {
+    platform_plugins.ServerPath = GetPluginServer(platform_plugins.SearchPath);
+    if (!platform_plugins.ServerPath.empty()) {
+      if (FileSystem::Instance().Exists(platform_plugins.SearchPath) &&
+          FileSystem::Instance().Exists(platform_plugins.ServerPath))
+        m_compiler_invocation_ap->getSearchPathOptions()
+            .PluginSearchOpts.push_back(platform_plugins);
+    }
+  }
 }
 
 SwiftASTContext::~SwiftASTContext() {
@@ -1272,7 +1300,6 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
     for (; !buf.empty(); buf = buf.substr(info.bytes)) {
       llvm::SmallVector<swift::serialization::SearchPath> searchPaths;
       swift::serialization::ExtendedValidationInfo extended_validation_info;
-      auto &langOpts = invocation.getLangOptions();
       info = swift::serialization::validateSerializedAST(
           buf, invocation.getSILOptions().EnableOSSAModules,
           /*requiredSDK*/ StringRef(), &extended_validation_info,

lldb/test/API/lang/swift/macro/TestSwiftMacro.py

@@ -71,4 +71,6 @@ def testInteractive(self):
 #       CHECK: CacheUserImports(){{.*}}: Macro.
 #       CHECK: SwiftASTContextForExpressions{{.*}}::LoadOneModule(){{.*}}Imported module Macro from {kind = Serialized Swift AST, filename = "{{.*}}Macro.swiftmodule";}
 #       CHECK: CacheUserImports(){{.*}}Scanning for search paths in{{.*}}Macro.swiftmodule
+#       The bots have too old an Xcode for this.
+#       DISABLED: SwiftASTContextForExpressions{{.*}}::LogConfiguration(){{.*}} -external-plugin-path {{.*}}/Developer/Platforms/{{.*}}.platform/Developer/usr/local/lib/swift/host/plugins{{.*}}#{{.*}}/swift-plugin-server
 #       CHECK: SwiftASTContextForExpressions{{.*}}::LogConfiguration(){{.*}} -external-plugin-path {{.*}}/lang/swift/macro/{{.*}}#{{.*}}/swift-plugin-server