[Platform paths for Darwin macros] Don't escape paths

Author: DougGregor

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -429,10 +429,10 @@ public final class DarwinToolchain: Toolchain {
       // that SDK's plugin server).
       let sdkPathRoot = VirtualPath.lookup(sdkPath).appending(components: "usr")
       commandLine.appendFlag(.externalPluginPath)
-      commandLine.appendFlag("\(sdkPathRoot.pluginPath.name)#\(sdkPathRoot.pluginServerPath.name.spm_shellEscaped())")
+      commandLine.appendFlag("\(sdkPathRoot.pluginPath.name)#\(sdkPathRoot.pluginServerPath.name)")
 
       commandLine.appendFlag(.externalPluginPath)
-      commandLine.appendFlag("\(sdkPathRoot.localPluginPath.name)#\(sdkPathRoot.pluginServerPath.name.spm_shellEscaped())")
+      commandLine.appendFlag("\(sdkPathRoot.localPluginPath.name)#\(sdkPathRoot.pluginServerPath.name)")
 
       // Determine the platform path. For simulator platforms, look into the
       // corresponding device platform instance.
@@ -452,10 +452,10 @@ public final class DarwinToolchain: Toolchain {
       // platform's plugin server).
       let platformPathRoot = platformPath.appending(components: "Developer", "usr")
       commandLine.appendFlag(.externalPluginPath)
-      commandLine.appendFlag("\(platformPathRoot.pluginPath.name)#\(platformPathRoot.pluginServerPath.name.spm_shellEscaped())")
+      commandLine.appendFlag("\(platformPathRoot.pluginPath.name)#\(platformPathRoot.pluginServerPath.name)")
 
       commandLine.appendFlag(.externalPluginPath)
-      commandLine.appendFlag("\(platformPathRoot.localPluginPath.name)#\(platformPathRoot.pluginServerPath.name.spm_shellEscaped())")
+      commandLine.appendFlag("\(platformPathRoot.localPluginPath.name)#\(platformPathRoot.pluginServerPath.name)")
     }
   }
 }

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -6787,7 +6787,7 @@ final class SwiftDriverTests: XCTestCase {
   func pluginPathTest(platform: String, searchPlatform: String) throws {
     let sdkRoot = testInputsPath.appending(
       components: ["PlatformChecks", "\(platform).platform", "Developer", "SDKs", "\(platform).sdk"])
-    var driver = try Driver(args: ["swiftc", "-typecheck", "foo.swift", "-sdk", VirtualPath.absolute(sdkRoot).name, "-plugin-path", "PluginA", "-external-plugin-path", "PluginB#Bexe", "-load-plugin-library", "PluginB2", "-plugin-path", "PluginC"])
+    var driver = try Driver(args: ["swiftc", "-typecheck", "foo.swift", "-sdk", VirtualPath.absolute(sdkRoot).name, "-plugin-path", "PluginA", "-external-plugin-path", "Plugin~B#Bexe", "-load-plugin-library", "PluginB2", "-plugin-path", "PluginC"])
     guard driver.isFrontendArgSupported(.pluginPath) && driver.isFrontendArgSupported(.externalPluginPath) else {
       return
     }
@@ -6800,7 +6800,7 @@ final class SwiftDriverTests: XCTestCase {
     let pluginAIndex = job.commandLine.firstIndex(of: .path(VirtualPath.relative(.init("PluginA"))))
     XCTAssertNotNil(pluginAIndex)
 
-    let pluginBIndex = job.commandLine.firstIndex(of: .path(VirtualPath.relative(.init("PluginB#Bexe"))))
+    let pluginBIndex = job.commandLine.firstIndex(of: .path(VirtualPath.relative(.init("Plugin~B#Bexe"))))
     XCTAssertNotNil(pluginBIndex)
     XCTAssertLessThan(pluginAIndex!, pluginBIndex!)