Merge pull request #1433 from compnerd/virtual-paths

SwiftDriver: speculative changes to support Windows macros

Author: compnerd

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -482,13 +482,21 @@ extension VirtualPath {
   // Given a virtual path pointing into a toolchain/SDK/platform, produce the
   // path to `swift-plugin-server`.
   fileprivate var pluginServerPath: VirtualPath {
+#if os(Windows)
+    self.appending(components: "bin", "swift-plugin-server.exe")
+#else
     self.appending(components: "bin", "swift-plugin-server")
+#endif
   }
 
   // Given a virtual path pointing into a toolchain/SDK/platform, produce the
   // path to the plugins.
   var pluginPath: VirtualPath {
+#if os(Windows)
+    self.appending(components: "bin")
+#else
     self.appending(components: "lib", "swift", "host", "plugins")
+#endif
   }
 
   // Given a virtual path pointing into a toolchain/SDK/platform, produce the

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -6939,8 +6939,12 @@ final class SwiftDriverTests: XCTestCase {
     #endif
 
     XCTAssertTrue(job.commandLine.contains(.flag("-plugin-path")))
+#if os(Windows)
+    XCTAssertTrue(job.commandLine.contains(.path(.absolute(try driver.toolchain.executableDir.parentDirectory.appending(components: "bin")))))
+#else
     XCTAssertTrue(job.commandLine.contains(.path(.absolute(try driver.toolchain.executableDir.parentDirectory.appending(components: "lib", "swift", "host", "plugins")))))
     XCTAssertTrue(job.commandLine.contains(.path(.absolute(try driver.toolchain.executableDir.parentDirectory.appending(components: "local", "lib", "swift", "host", "plugins")))))
+#endif
   }
 
   func testClangModuleValidateOnce() throws {