Merge pull request #1592 from ktoso/pick-toolchain-plugin

Author: ktoso

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -473,21 +473,24 @@ extension Driver {
       commandLine.appendFlag($0)
     }
 
+    let toolchainStdlibPath = VirtualPath.lookup(frontendTargetInfo.runtimeResourcePath.path)
+      .appending(components: frontendTargetInfo.target.triple.platformName() ?? "", "Swift.swiftmodule")
+    let hasToolchainStdlib = try fileSystem.exists(toolchainStdlibPath)
+
+    // If the resource directory has the standard library, prefer the toolchain's plugins
+    // to the platform SDK plugins.
+    if hasToolchainStdlib {
+      try addPluginPathArguments(commandLine: &commandLine)
+    }
+
     try toolchain.addPlatformSpecificCommonFrontendOptions(commandLine: &commandLine,
                                                            inputs: &inputs,
                                                            frontendTargetInfo: frontendTargetInfo,
                                                            driver: &self)
 
-    // Platform-agnostic options that need to happen after platform-specific ones.
-    if isFrontendArgSupported(.pluginPath) {
-      // Default paths for compiler plugins found within the toolchain
-      // (loaded as shared libraries).
-      let pluginPathRoot = VirtualPath.absolute(try toolchain.executableDir.parentDirectory)
-      commandLine.appendFlag(.pluginPath)
-      commandLine.appendPath(pluginPathRoot.pluginPath)
-
-      commandLine.appendFlag(.pluginPath)
-      commandLine.appendPath(pluginPathRoot.localPluginPath)
+    // Otherwise, prefer the platform's plugins.
+    if !hasToolchainStdlib {
+      try addPluginPathArguments(commandLine: &commandLine)
     }
   }
 
@@ -774,6 +777,22 @@ extension Driver {
     try explicitDependencyBuildPlanner?.resolveBridgingHeaderDependencies(inputs: &inputs, commandLine: &commandLine)
   }
 
+  mutating func addPluginPathArguments(commandLine: inout [Job.ArgTemplate]) throws {
+    guard isFrontendArgSupported(.pluginPath) else {
+      return
+    }
+
+    // Default paths for compiler plugins found within the toolchain
+    // (loaded as shared libraries).
+    let pluginPathRoot = VirtualPath.absolute(try toolchain.executableDir.parentDirectory)
+    commandLine.appendFlag(.pluginPath)
+    commandLine.appendPath(pluginPathRoot.pluginPath)
+
+    commandLine.appendFlag(.pluginPath)
+    commandLine.appendPath(pluginPathRoot.localPluginPath)
+  }
+
+
   /// If explicit dependency planner supports creating bridging header pch command.
   public func supportsBridgingHeaderPCHCommand() throws -> Bool {
     return try explicitDependencyBuildPlanner?.supportsBridgingHeaderPCHCommand() ?? false

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -7342,7 +7342,15 @@ final class SwiftDriverTests: XCTestCase {
 
     let toolchainPluginPathIndex = job.commandLine.firstIndex(of: .path(.absolute(try driver.toolchain.executableDir.parentDirectory.appending(components: "lib", "swift", "host", "plugins"))))
     XCTAssertNotNil(toolchainPluginPathIndex)
-    XCTAssertLessThan(platformLocalPluginPathIndex!, toolchainPluginPathIndex!)
+
+    let toolchainStdlibPath = VirtualPath.lookup(driver.frontendTargetInfo.runtimeResourcePath.path)
+      .appending(components: driver.frontendTargetInfo.target.triple.platformName() ?? "", "Swift.swiftmodule")
+    let hasToolchainStdlib = try driver.fileSystem.exists(toolchainStdlibPath)
+    if hasToolchainStdlib {
+      XCTAssertGreaterThan(platformLocalPluginPathIndex!, toolchainPluginPathIndex!)
+    } else {
+      XCTAssertLessThan(platformLocalPluginPathIndex!, toolchainPluginPathIndex!)
+    }
     #endif
 
     XCTAssertTrue(job.commandLine.contains(.flag("-plugin-path")))