Building object files using -c with -lto should respect the output file path (-o) if present

Author: kubamracek

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -79,6 +79,10 @@ extension Driver {
     case .object:
       return (linkerOutputType == nil)
     case .llvmBitcode:
+      if linkerOutputType == nil {
+        return true
+      }
+
       if compilerOutputType != .llvmBitcode {
         // The compiler output isn't bitcode, so bitcode isn't top-level (-embed-bitcode).
         return false

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -313,6 +313,27 @@ final class SwiftDriverTests: XCTestCase {
     XCTAssertEqual(driver6.compilerOutputType, .llvmBitcode)
   }
 
+  func testLtoOutputPath() throws {
+    var driver1 = try Driver(args: ["swiftc", "foo.swift", "-lto=llvm-full",
+                                    "-c", "-target", "x86_64-apple-macosx10.9"])
+    XCTAssertEqual(driver1.compilerOutputType, .llvmBitcode)
+    XCTAssertEqual(driver1.linkerOutputType, nil)
+    let jobs1 = try driver1.planBuild()
+    XCTAssertEqual(jobs1.count, 1)
+    XCTAssertEqual(jobs1[0].outputs.count, 1)
+    XCTAssertEqual(jobs1[0].outputs[0].file.basename, "foo.bc")
+
+    var driver2 = try Driver(args: ["swiftc", "foo.swift", "-lto=llvm-full",
+                                    "-c", "-target", "x86_64-apple-macosx10.9",
+                                    "-o", "foo.o"])
+    XCTAssertEqual(driver2.compilerOutputType, .llvmBitcode)
+    XCTAssertEqual(driver2.linkerOutputType, nil)
+    let jobs2 = try driver2.planBuild()
+    XCTAssertEqual(jobs2.count, 1)
+    XCTAssertEqual(jobs2[0].outputs.count, 1)
+    XCTAssertEqual(jobs2[0].outputs[0].file.basename, "foo.o")
+  }
+
   func testPrimaryOutputKindsDiagnostics() throws {
       try assertDriverDiagnostics(args: "swift", "-i") {
         $1.expect(.error("the flag '-i' is no longer required and has been removed; use 'swift input-filename'"))
@@ -4261,7 +4282,7 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(plannedJobs[1].inputs.count, 2)
       XCTAssertEqual(plannedJobs[1].inputs[0].file, try VirtualPath(path: "foo.swift"))
       XCTAssertEqual(plannedJobs[1].outputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[1].outputs[0].file, "foo.bc"))
+      XCTAssertEqual(plannedJobs[1].outputs[0].file, try VirtualPath(path: "foo.bc"))
 
       XCTAssertEqual(plannedJobs[2].kind, .backend)
     }
@@ -4541,11 +4562,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(compileJob.inputs.count, 1)
       XCTAssertEqual(compileJob.inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
       XCTAssertEqual(compileJob.outputs.count, 1)
-      XCTAssertTrue(matchTemporary(compileJob.outputs[0].file, "embed-bitcode.bc"))
+      XCTAssertEqual(compileJob.outputs[0].file, .relative(RelativePath("embed-bitcode.bc")))
 
       let backendJob = plannedJobs.first(where: {$0.kind == .backend})!
       XCTAssertEqual(backendJob.inputs.count, 1)
-      XCTAssertTrue(matchTemporary(backendJob.inputs[0].file, "embed-bitcode.bc"))
+      XCTAssertEqual(backendJob.inputs[0].file, .relative(RelativePath("embed-bitcode.bc")))
       XCTAssertEqual(backendJob.outputs.count, 1)
       XCTAssertEqual(backendJob.outputs[0].file, .relative(RelativePath("embed-bitcode.o")))
 
@@ -4588,21 +4609,21 @@ final class SwiftDriverTests: XCTestCase {
 
       XCTAssertEqual(plannedJobs[1].kind, .compile)
       XCTAssertEqual(plannedJobs[1].outputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[1].outputs[0].file, "embed-bitcode.bc"))
+      XCTAssertEqual(plannedJobs[1].outputs[0].file, .relative(RelativePath("embed-bitcode.bc")))
 
       XCTAssertEqual(plannedJobs[2].kind, .backend)
       XCTAssertEqual(plannedJobs[2].inputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[2].inputs[0].file, "embed-bitcode.bc"))
+      XCTAssertEqual(plannedJobs[2].inputs[0].file, .relative(RelativePath("embed-bitcode.bc")))
       XCTAssertEqual(plannedJobs[2].outputs.count, 1)
       XCTAssertEqual(plannedJobs[2].outputs[0].file, .relative(RelativePath("embed-bitcode.o")))
 
       XCTAssertEqual(plannedJobs[3].kind, .compile)
       XCTAssertEqual(plannedJobs[3].outputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[3].outputs[0].file, "empty.bc"))
+      XCTAssertEqual(plannedJobs[3].outputs[0].file, .relative(RelativePath("empty.bc")))
 
       XCTAssertEqual(plannedJobs[4].kind, .backend)
       XCTAssertEqual(plannedJobs[4].inputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[4].inputs[0].file, "empty.bc"))
+      XCTAssertEqual(plannedJobs[4].inputs[0].file, .relative(RelativePath("empty.bc")))
 
       XCTAssertEqual(plannedJobs[4].outputs.count, 1)
       XCTAssertEqual(plannedJobs[4].outputs[0].file, .relative(RelativePath("empty.o")))
@@ -4627,11 +4648,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(plannedJobs[0].inputs.count, 1)
       XCTAssertEqual(plannedJobs[0].inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
       XCTAssertEqual(plannedJobs[0].outputs.count, 4)
-      XCTAssertTrue(matchTemporary(plannedJobs[0].outputs[0].file, "Swift.bc"))
+      XCTAssertEqual(plannedJobs[0].outputs[0].file, .relative(RelativePath("Swift.bc")))
 
       XCTAssertEqual(plannedJobs[1].kind, .backend)
       XCTAssertEqual(plannedJobs[1].inputs.count, 1)
-      XCTAssertTrue(matchTemporary(plannedJobs[1].inputs[0].file, "Swift.bc"))
+      XCTAssertEqual(plannedJobs[1].inputs[0].file, .relative(RelativePath("Swift.bc")))
       XCTAssertEqual(plannedJobs[1].outputs.count, 1)
       XCTAssertEqual(plannedJobs[1].outputs[0].file, .relative(RelativePath("Swift.o")))
     }
@@ -5162,9 +5183,9 @@ final class SwiftDriverTests: XCTestCase {
         return
       }
       XCTAssertTrue(outputs.count == 3)
-      XCTAssertTrue(matchTemporary(outputs[0], "a.bc"))
-      XCTAssertTrue(matchTemporary(outputs[1], "b.bc"))
-      XCTAssertTrue(matchTemporary(outputs[2], "c.bc"))
+      XCTAssertEqual(outputs[0], try VirtualPath(path: "a.bc"))
+      XCTAssertEqual(outputs[1], try VirtualPath(path: "b.bc"))
+      XCTAssertEqual(outputs[2], try VirtualPath(path: "c.bc"))
     }
 
     do {