Infer object format when it can't be determined from a triple's successfully parsed environment

Author: owenv

Sources/SwiftDriver/Utilities/Triple.swift

@@ -167,6 +167,8 @@ public struct Triple {
     if let parsedEnv = parsedEnv {
       self.environment = parsedEnv.value.environment
       self.objectFormat = parsedEnv.value.objectFormat
+        ?? ObjectFormat.infer(arch: parsedArch?.value.arch,
+                              os: parsedOS?.value)
     }
     else {
       self.environment = Environment.infer(archName: parsedArch?.substring)

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -1310,52 +1310,49 @@ final class SwiftDriverTests: XCTestCase {
   }
 
   func testModuleWrapJob() throws {
+    // FIXME: These tests will fail when run on macOS, because
+    // swift-autolink-extract is not present
+    #if os(Linux)
     do {
       var driver = try Driver(args: ["swiftc", "-target", "x86_64-unknown-linux-gnu", "-g", "foo.swift"])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 4)
-      // FIXME: There should also be an autolink-extract job. It looks like our
-      // triple parsing code is not detecting the object file format correctly.
-      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .mergeModule, .moduleWrap, .link])
-      XCTAssertEqual(plannedJobs[2].inputs.count, 1)
-      XCTAssertEqual(plannedJobs[2].inputs.count, 1)
-      XCTAssertTrue(plannedJobs[2].commandLine.contains(subsequence: ["-target", "x86_64-unknown-linux-gnu"]))
-      XCTAssertTrue(plannedJobs[1].outputs.contains(plannedJobs[2].inputs.first!))
-      XCTAssertTrue(plannedJobs[3].inputs.contains(plannedJobs[2].outputs.first!))
-    }
-
-    // dsymutil won't be found on other platforms
-    #if os(macOS)
-    do {
-      var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-macosx10.15", "-g", "foo.swift"])
-      let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 4)
-      // No module wrapping with Mach-O.
-      // FIXME: There should also be an autolink-extract job. It looks like our
-      // triple parsing code is not detecting the object file format correctly.
-      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .mergeModule, .link, .generateDSYM])
+      XCTAssertEqual(plannedJobs.count, 5)
+      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .autolinkExtract, .mergeModule, .moduleWrap, .link])
+      XCTAssertEqual(plannedJobs[3].inputs.count, 1)
+      XCTAssertEqual(plannedJobs[3].inputs.count, 1)
+      XCTAssertTrue(plannedJobs[3].commandLine.contains(subsequence: ["-target", "x86_64-unknown-linux-gnu"]))
+      XCTAssertTrue(plannedJobs[2].outputs.contains(plannedJobs[3].inputs.first!))
+      XCTAssertTrue(plannedJobs[4].inputs.contains(plannedJobs[3].outputs.first!))
     }
-    #endif
 
     do {
       var driver = try Driver(args: ["swiftc", "-target", "x86_64-unknown-linux-gnu", "foo.swift"])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 2)
+      XCTAssertEqual(plannedJobs.count, 3)
       // No merge module/module wrap jobs.
-      // FIXME: There should also be an autolink-extract job. It looks like our
-      // triple parsing code is not detecting the object file format correctly.
-      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .link])
+      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .autolinkExtract, .link])
     }
 
     do {
       var driver = try Driver(args: ["swiftc", "-target", "x86_64-unknown-linux-gnu", "-gdwarf-types", "foo.swift"])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 3)
+      XCTAssertEqual(plannedJobs.count, 4)
       // Merge module, but no module wrapping.
+      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .autolinkExtract, .mergeModule, .link])
+    }
+    #endif
+    // dsymutil won't be found on other platforms
+    #if os(macOS)
+    do {
+      var driver = try Driver(args: ["swiftc", "-target", "x86_64-apple-macosx10.15", "-g", "foo.swift"])
+      let plannedJobs = try driver.planBuild()
+      XCTAssertEqual(plannedJobs.count, 4)
+      // No module wrapping with Mach-O.
       // FIXME: There should also be an autolink-extract job. It looks like our
       // triple parsing code is not detecting the object file format correctly.
-      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .mergeModule, .link])
+      XCTAssertEqual(plannedJobs.map { $0.kind }, [.compile, .mergeModule, .link, .generateDSYM])
     }
+    #endif
   }
 
   func testRepl() throws {

Tests/SwiftDriverTests/TripleTests.swift

@@ -933,7 +933,9 @@ final class TripleTests: XCTestCase {
   }
 
   func testFileFormat() {
-//    XCTAssertEqual(.elf, Triple("i686-unknown-linux-gnu").objectFormat)
+    XCTAssertEqual(.elf, Triple("i686-unknown-linux-gnu").objectFormat)
+    XCTAssertEqual(.elf, Triple("x86_64-unknown-linux-gnu").objectFormat)
+    XCTAssertEqual(.elf, Triple("x86_64-gnu-linux").objectFormat)
     XCTAssertEqual(.elf, Triple("i686-unknown-freebsd").objectFormat)
     XCTAssertEqual(.elf, Triple("i686-unknown-netbsd").objectFormat)
     XCTAssertEqual(.elf, Triple("i686--win32-elf").objectFormat)