Merge pull request #339 from owenv/linker-input-fix

Fix a regression affecting command line linker inputs

Author: owenv

Sources/SwiftDriver/Jobs/Planning.swift

@@ -196,19 +196,18 @@ extension Driver {
     addLinkerInput: (TypedVirtualPath) -> Void,
     addJobOutputs: ([TypedVirtualPath]) -> Void)
   throws {
-    let swiftInputFiles = inputFiles.filter { inputFile in
-      inputFile.type.isPartOfSwiftCompilation
-    }
-    for (index, input) in swiftInputFiles.enumerated() {
+    let loadedModuleTraceInputIndex = inputFiles.firstIndex(where: {
+      $0.type.isPartOfSwiftCompilation && loadedModuleTracePath != nil
+    })
+    for (index, input) in inputFiles.enumerated() {
       // Only emit a loaded module trace from the first frontend job.
-      let emitModuleTrace = (index == swiftInputFiles.startIndex) && (loadedModuleTracePath != nil)
       try addJobForPrimaryInput(
         input: input,
         addJobGroup: addJobGroup,
         addModuleInput: addModuleInput,
         addLinkerInput: addLinkerInput,
         addJobOutputs: addJobOutputs,
-        emitModuleTrace: emitModuleTrace)
+        emitModuleTrace: index == loadedModuleTraceInputIndex)
     }
   }
 

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -329,7 +329,7 @@ final class IncrementalCompilationTests: XCTestCase {
       }
       let args: [String] = [
         "swiftc",
-        "module-name", module,
+        "-module-name", module,
         "-o", derivedDataPath.appending(component: module + ".o").pathString,
         "-output-file-map", OFM.pathString,
         "-driver-show-incremental",

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -875,6 +875,26 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-shared")))
     }
 
+    do {
+      // Object file inputs
+      var driver = try Driver(args: commonArgs + ["baz.o", "-emit-library", "-target", "x86_64-apple-macosx10.15"], env: env)
+      let plannedJobs = try driver.planBuild()
+
+      XCTAssertEqual(3, plannedJobs.count)
+      XCTAssertFalse(plannedJobs.contains { $0.kind == .autolinkExtract })
+
+      let linkJob = plannedJobs[2]
+      XCTAssertEqual(linkJob.kind, .link)
+
+      let cmd = linkJob.commandLine
+      XCTAssertTrue(linkJob.inputs.contains(.init(file: .temporary(.init("foo.o")), type: .object)))
+      XCTAssertTrue(linkJob.inputs.contains(.init(file: .temporary(.init("bar.o")), type: .object)))
+      XCTAssertTrue(linkJob.inputs.contains(.init(file: .relative(.init("baz.o")), type: .object)))
+      XCTAssertTrue(cmd.contains(.path(.temporary(.init("foo.o")))))
+      XCTAssertTrue(cmd.contains(.path(.temporary(.init("bar.o")))))
+      XCTAssertTrue(cmd.contains(.path(.relative(.init("baz.o")))))
+    }
+
     do {
       // static linking
       var driver = try Driver(args: commonArgs + ["-emit-library", "-static", "-L", "/tmp", "-Xlinker", "-w", "-target", "x86_64-apple-macosx10.15"], env: env)
@@ -2389,13 +2409,26 @@ final class SwiftDriverTests: XCTestCase {
     do {
       var driver = try Driver(args: ["swiftc", "-typecheck",
                                      "-emit-loaded-module-trace",
-                                     "foo.swift, bar.swift", "baz.swift"])
+                                     "foo.swift", "bar.swift", "baz.swift"])
+      let plannedJobs = try driver.planBuild()
+      let tracedJobs = plannedJobs.filter {
+        $0.commandLine.contains(subsequence: ["-emit-loaded-module-trace-path",
+                                              .path(.relative(.init("main.trace.json")))])
+      }
+      XCTAssertEqual(tracedJobs.count, 1)
+    }
+    do {
+      // Make sure the trace is associated with the first frontend job as
+      // opposed to the first input.
+      var driver = try Driver(args: ["swiftc", "-emit-loaded-module-trace",
+                                     "foo.o", "bar.swift", "baz.o"])
       let plannedJobs = try driver.planBuild()
       let tracedJobs = plannedJobs.filter {
         $0.commandLine.contains(subsequence: ["-emit-loaded-module-trace-path",
                                               .path(.relative(.init("main.trace.json")))])
       }
       XCTAssertEqual(tracedJobs.count, 1)
+      XCTAssertTrue(tracedJobs[0].inputs.contains(.init(file: .relative(.init("bar.swift")), type: .swift)))
     }
     do {
       var env = ProcessEnv.vars