Merge pull request #220 from owenv/response-file-path-resolution

Properly resolve paths to temporary response files when autolinking

Author: owenv

Sources/SwiftDriver/Execution/ArgsResolver.swift

@@ -73,6 +73,8 @@ public struct ArgsResolver {
 
       // Otherwise, return the path.
       return path.name
+    case .responseFilePath(let path):
+      return "@\(try resolve(.path(path)))"
     }
   }
 

Sources/SwiftDriver/Jobs/CommandLineArguments.swift

@@ -169,6 +169,8 @@ extension Array where Element == Job.ArgTemplate {
           return string.spm_shellEscaped()
         case .path(let path):
           return path.name.spm_shellEscaped()
+      case .responseFilePath(let path):
+        return "@\(path.name.spm_shellEscaped())"
       }
     }.joined(separator: " ")
   }

Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

@@ -161,7 +161,7 @@ extension GenericUnixToolchain {
       let inputFiles: [Job.ArgTemplate] = inputs.map { input in
         // Autolink inputs are handled specially
         if input.type == .autolink {
-          return .flag("@\(input.file.name)")
+          return .responseFilePath(input.file)
         }
         return .path(input.file)
       }
@@ -210,7 +210,7 @@ extension GenericUnixToolchain {
         guard fileSystem.isFile(linkFile) else {
           fatalError("\(linkFile.pathString) not found")
         }
-        commandLine.appendFlag("@\(linkFile.pathString)")
+        commandLine.append(.responseFilePath(.absolute(linkFile)))
       }
 
       // Explicitly pass the target to the linker

Sources/SwiftDriver/Jobs/Job.swift

@@ -43,6 +43,9 @@ public struct Job: Codable, Equatable, Hashable {
 
     /// Represents a virtual path on disk.
     case path(VirtualPath)
+
+    /// Represents a response file path prefixed by '@'.
+    case responseFilePath(VirtualPath)
   }
 
   /// The Swift module this job involves.
@@ -215,7 +218,7 @@ extension Job.Kind {
 
 extension Job.ArgTemplate: Codable {
   private enum CodingKeys: String, CodingKey {
-    case flag, path
+    case flag, path, responseFilePath
   }
 
   public func encode(to encoder: Encoder) throws {
@@ -227,6 +230,9 @@ extension Job.ArgTemplate: Codable {
     case let .path(a1):
       var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .path)
       try unkeyedContainer.encode(a1)
+    case let .responseFilePath(a1):
+      var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .responseFilePath)
+      try unkeyedContainer.encode(a1)
     }
   }
 
@@ -244,6 +250,10 @@ extension Job.ArgTemplate: Codable {
       var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
       let a1 = try unkeyedValues.decode(VirtualPath.self)
       self = .path(a1)
+    case .responseFilePath:
+      var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
+      let a1 = try unkeyedValues.decode(VirtualPath.self)
+      self = .responseFilePath(a1)
     }
   }
 }

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -857,6 +857,7 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertTrue(cmd.contains(.flag("-shared")))
       XCTAssertTrue(cmd.contains(.path(.temporary(RelativePath("foo.o")))))
       XCTAssertTrue(cmd.contains(.path(.temporary(RelativePath("bar.o")))))
+      XCTAssertTrue(cmd.contains(.responseFilePath(.temporary(RelativePath("Test.autolink")))))
       XCTAssertEqual(linkJob.outputs[0].file, try VirtualPath(path: "libTest.so"))
 
       XCTAssertFalse(cmd.contains(.flag("-dylib")))