Add abi descriptor to the output file list

Author: nkcsgexi

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -92,7 +92,9 @@ extension Driver {
     commandLine.appendPath(outputPath)
     if isFeatureSupported(.emit_abi_descriptor) {
       commandLine.appendFlag(.emitAbiDescriptorPath)
-      commandLine.appendPath(outputPath.replacingExtension(with: .jsonABIBaseline))
+      let abiOutput = outputPath.replacingExtension(with: .jsonABIBaseline)
+      commandLine.appendPath(abiOutput)
+      outputs.append(TypedVirtualPath(file: abiOutput.intern(), type: .jsonABIBaseline))
     }
     return Job(
       moduleName: moduleOutputInfo.name,

Sources/SwiftDriver/Jobs/MergeModuleJob.swift

@@ -78,7 +78,9 @@ extension Driver {
 
     if isFeatureSupported(.emit_abi_descriptor) {
       commandLine.appendFlag(.emitAbiDescriptorPath)
-      commandLine.appendPath(outputPath.replacingExtension(with: .jsonABIBaseline))
+      let abiOutput = outputPath.replacingExtension(with: .jsonABIBaseline)
+      commandLine.appendPath(abiOutput)
+      outputs.append(TypedVirtualPath(file: abiOutput.intern(), type: .jsonABIBaseline))
     }
     return Job(
       moduleName: moduleOutputInfo.name,

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -2246,10 +2246,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(Set(plannedJobs.map { $0.kind }), Set([.compile, .emitModule, .link]))
       XCTAssertTrue(plannedJobs[0].tool.name.contains("swift"))
       XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-parse-as-library")))
-      XCTAssertEqual(plannedJobs[0].outputs.count, 3)
+      XCTAssertEqual(plannedJobs[0].outputs.count, 4)
       XCTAssertEqual(plannedJobs[0].outputs[0].file, .absolute(AbsolutePath("/foo/bar/Test.swiftmodule")))
       XCTAssertEqual(plannedJobs[0].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
       XCTAssertEqual(plannedJobs[0].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
+      XCTAssertEqual(plannedJobs[0].outputs[3].file, .absolute(AbsolutePath("/foo/bar/Test.abi.json")))
 
       // We don't know the output file of the symbol graph, just make sure the flag is passed along.
       XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-emit-symbol-graph-dir")))
@@ -2263,10 +2264,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(plannedJobs.count, 1)
       XCTAssertEqual(Set(plannedJobs.map { $0.kind }), Set([.emitModule]))
       XCTAssertTrue(plannedJobs[0].tool.name.contains("swift"))
-      XCTAssertEqual(plannedJobs[0].outputs.count, 3)
+      XCTAssertEqual(plannedJobs[0].outputs.count, 4)
       XCTAssertEqual(plannedJobs[0].outputs[0].file, .absolute(AbsolutePath("/foo/bar/Test.swiftmodule")))
       XCTAssertEqual(plannedJobs[0].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
       XCTAssertEqual(plannedJobs[0].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
+      XCTAssertEqual(plannedJobs[0].outputs[3].file, .absolute(AbsolutePath("/foo/bar/Test.abi.json")))
     }
 
     do {
@@ -3485,6 +3487,8 @@ final class SwiftDriverTests: XCTestCase {
       "emitModule (swift-frontend)" -> "test.swiftmodule" [color=green];
       "test.swiftdoc" [fontsize=12];
       "emitModule (swift-frontend)" -> "test.swiftdoc" [color=green];
+      "test.abi.json" [fontsize=12];
+      "emitModule (swift-frontend)" -> "test.abi.json" [color=green];
       "compile (swift-frontend)" [style=bold];
       "test.swift" -> "compile (swift-frontend)" [color=blue];
       "test-1.o" [fontsize=12];
@@ -4542,10 +4546,11 @@ final class SwiftDriverTests: XCTestCase {
       let emitModuleJob = plannedJobs.first(where: {$0.kind == .emitModule})!
       XCTAssertEqual(emitModuleJob.inputs.count, 1)
       XCTAssertEqual(emitModuleJob.inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
-      XCTAssertEqual(emitModuleJob.outputs.count, 3)
+      XCTAssertEqual(emitModuleJob.outputs.count, 4)
       XCTAssertEqual(emitModuleJob.outputs[0].file, .relative(RelativePath("main.swiftmodule")))
       XCTAssertEqual(emitModuleJob.outputs[1].file, .relative(RelativePath("main.swiftdoc")))
       XCTAssertEqual(emitModuleJob.outputs[2].file, .relative(RelativePath("main.swiftsourceinfo")))
+      XCTAssertEqual(emitModuleJob.outputs[3].file, .relative(RelativePath("main.abi.json")))
     }
 
     do {
@@ -4600,10 +4605,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(emitModuleJob.inputs.count, 2)
       XCTAssertEqual(emitModuleJob.inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
       XCTAssertEqual(emitModuleJob.inputs[1].file, .relative(RelativePath("empty.swift")))
-      XCTAssertEqual(emitModuleJob.outputs.count, 3)
+      XCTAssertEqual(emitModuleJob.outputs.count, 4)
       XCTAssertEqual(emitModuleJob.outputs[0].file, .relative(RelativePath("ABC.swiftmodule")))
       XCTAssertEqual(emitModuleJob.outputs[1].file, .relative(RelativePath("ABC.swiftdoc")))
       XCTAssertEqual(emitModuleJob.outputs[2].file, .relative(RelativePath("ABC.swiftsourceinfo")))
+      XCTAssertEqual(emitModuleJob.outputs[3].file, .relative(RelativePath("ABC.abi.json")))
     }
 
     do {