Infer baseline output paths from swiftsourceinfo output file map entries

Author: owenv

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -54,6 +54,13 @@ public struct OutputFileMap: Hashable, Codable {
       }
       return VirtualPath.lookup(path).replacingExtension(with: outputType).intern()
 
+    case .jsonAPIBaseline, .jsonABIBaseline:
+      // Infer paths for these entities using .swiftsourceinfo path.
+      guard let path = entries[inputFile]?[.swiftSourceInfoFile] else {
+        return nil
+      }
+      return VirtualPath.lookup(path).replacingExtension(with: outputType).intern()
+
     case .object:
       // We may generate .o files from bitcode .bc files, but the output file map
       // uses .swift file as the key for .o file paths. So we need to dig further.

Tests/SwiftDriverTests/APIDigesterTests.swift

@@ -92,6 +92,54 @@ class APIDigesterTests: XCTestCase {
         XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(projectDirPath.appending(component: "foo.abi.json")))]))
       }
     }
+    do {
+      try withTemporaryDirectory { path in
+        let ofmPath = path.appending(component: "ofm.json")
+        try localFileSystem.writeFileContents(ofmPath) {
+          $0 <<< """
+          {
+            "": {
+              "abi-baseline-json": "/path/to/baseline.abi.json"
+            }
+          }
+          """
+        }
+        var driver = try Driver(args: ["swiftc", "-wmo", "-emit-module",
+                                       "-emit-module-interface", "-enable-library-evolution",
+                                       path.appending(component: "foo.swift").pathString,
+                                       "-emit-digester-baseline",
+                                       "-digester-mode", "abi",
+                                       "-o", path.appending(component: "foo.swiftmodule").pathString,
+                                       "-output-file-map", ofmPath.pathString,
+                                      ])
+        let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .generateABIBaseline })
+        XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init("/path/to/baseline.abi.json")))]))
+      }
+    }
+    do {
+      try withTemporaryDirectory { path in
+        let ofmPath = path.appending(component: "ofm.json")
+        try localFileSystem.writeFileContents(ofmPath) {
+          $0 <<< """
+          {
+            "": {
+              "swiftsourceinfo": "/path/to/sourceinfo"
+            }
+          }
+          """
+        }
+        var driver = try Driver(args: ["swiftc", "-wmo", "-emit-module",
+                                       "-emit-module-interface", "-enable-library-evolution",
+                                       path.appending(component: "foo.swift").pathString,
+                                       "-emit-digester-baseline",
+                                       "-digester-mode", "abi",
+                                       "-o", path.appending(component: "foo.swiftmodule").pathString,
+                                       "-output-file-map", ofmPath.pathString,
+                                      ])
+        let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .generateABIBaseline })
+        XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init("/path/to/sourceinfo.abi.json")))]))
+      }
+    }
   }
 
   func testBaselineGenerationJobFlags() throws {