Add target variant api description

This patch adds the api description to the set of supplemental outputs
emitted for both the target and target variant.

Author: etcwilde

Sources/SwiftDriver/Driver/Driver.swift

@@ -395,6 +395,9 @@ public struct Driver {
 
     /// Path to the Swift module source information file.
     let moduleSourceInfoPath: VirtualPath.Handle?
+
+    /// Path to the emitted API descriptor file.
+    let apiDescriptorFilePath: VirtualPath.Handle?
   }
 
   private static func computeModuleOutputPaths(
@@ -424,6 +427,24 @@ public struct Driver {
         moduleName: moduleOutputInfo.name,
         projectDirectory: projectDirectory)
 
+    // ---------------------
+    // API Descriptor Path
+    let apiDescriptorFilePath: VirtualPath.Handle?
+    if let apiDescriptorDirectory = apiDescriptorDirectory {
+      apiDescriptorFilePath = apiDescriptorDirectory
+        .appending(component: "\(moduleOutputInfo.name).\(target.moduleTriple.triple).swift.sdkdb")
+        .intern()
+    } else {
+      apiDescriptorFilePath = try Self.computeSupplementaryOutputPath(
+        &parsedOptions, type: .jsonAPIDescriptor, isOutputOptions: [],
+        outputPath: .emitApiDescriptorPath,
+        compilerOutputType: compilerOutputType,
+        compilerMode: compilerMode,
+        emitModuleSeparately: emitModuleSeparately,
+        outputFileMap: outputFileMap,
+        moduleName: moduleOutputInfo.name)
+    }
+
     // ---------------------
     // Swift interface paths
     let swiftInterfacePath = try Self.computeSupplementaryOutputPath(
@@ -492,6 +513,7 @@ public struct Driver {
       swiftPrivateInterfacePath: swiftPrivateInterfacePath,
       swiftPackageInterfacePath: swiftPackageInterfacePath,
       moduleSourceInfoPath: moduleSourceInfoPath)
+      apiDescriptorFilePath: apiDescriptorFilePath)
   }
 
   /// Structure storing paths to supplemental outputs for the target module
@@ -509,8 +531,6 @@ public struct Driver {
   /// Path to the module's digester baseline file.
   let digesterBaselinePath: VirtualPath.Handle?
 
-  /// Path to the emitted API descriptor file.
-  let apiDescriptorFilePath: VirtualPath.Handle?
 
   /// The mode the API digester should run in.
   let digesterMode: DigesterMode
@@ -1151,6 +1171,13 @@ public struct Driver {
       moduleOutputPath: moduleOutputInfo.output?.outputPath,
       fileSystem: self.fileSystem)
 
+    var apiDescriptorDirectory: VirtualPath? = nil
+    if let apiDescriptorDirectoryEnvVar = env["TAPI_SDKDB_OUTPUT_PATH"] {
+        apiDescriptorDirectory = try VirtualPath(path: apiDescriptorDirectoryEnvVar)
+    } else if let ldTraceFileEnvVar = env["LD_TRACE_FILE"] {
+        apiDescriptorDirectory = try VirtualPath(path: ldTraceFileEnvVar).parentDirectory.appending(component: "SDKDB")
+    }
+
     self.moduleOutputPaths = try Self.computeModuleOutputPaths(
       &parsedOptions,
       moduleName: moduleOutputInfo.name,
@@ -1161,8 +1188,11 @@ public struct Driver {
       emitModuleSeparately: emitModuleSeparately,
       outputFileMap: self.outputFileMap,
       projectDirectory: projectDirectory)
+      apiDescriptorDirectory: apiDescriptorDirectory,
+      target: frontendTargetInfo.target)
 
     if let variantModuleOutputInfo = self.variantModuleOutputInfo {
+       let targetVariant = self.frontendTargetInfo.targetVariant {
       self.variantModuleOutputPaths = try Self.computeModuleOutputPaths(
         &parsedOptions,
         moduleName: variantModuleOutputInfo.name,
@@ -1172,7 +1202,9 @@ public struct Driver {
         compilerMode: compilerMode,
         emitModuleSeparately: true, // variant module is always independent
         outputFileMap: self.outputFileMap,
-        projectDirectory: projectDirectory)
+        projectDirectory: projectDirectory,
+        apiDescriptorDirectory: apiDescriptorDirectory,
+        target: targetVariant)
     } else {
       self.variantModuleOutputPaths = nil
     }
@@ -1210,27 +1242,6 @@ public struct Driver {
         outputFileMap: self.outputFileMap,
         moduleName: moduleOutputInfo.name)
 
-    var apiDescriptorDirectory: VirtualPath? = nil
-    if let apiDescriptorDirectoryEnvVar = env["TAPI_SDKDB_OUTPUT_PATH"] {
-        apiDescriptorDirectory = try VirtualPath(path: apiDescriptorDirectoryEnvVar)
-    } else if let ldTraceFileEnvVar = env["LD_TRACE_FILE"] {
-        apiDescriptorDirectory = try VirtualPath(path: ldTraceFileEnvVar).parentDirectory.appending(component: "SDKDB")
-    }
-    if let apiDescriptorDirectory = apiDescriptorDirectory {
-        self.apiDescriptorFilePath = apiDescriptorDirectory
-          .appending(component: "\(moduleOutputInfo.name).\(frontendTargetInfo.target.moduleTriple.triple).swift.sdkdb")
-          .intern()
-    } else {
-        self.apiDescriptorFilePath = try Self.computeSupplementaryOutputPath(
-            &parsedOptions, type: .jsonAPIDescriptor, isOutputOptions: [],
-            outputPath: .emitApiDescriptorPath,
-            compilerOutputType: compilerOutputType,
-            compilerMode: compilerMode,
-            emitModuleSeparately: emitModuleSeparately,
-            outputFileMap: self.outputFileMap,
-            moduleName: moduleOutputInfo.name)
-    }
-
     Self.validateDigesterArgs(&parsedOptions,
                               moduleOutputInfo: moduleOutputInfo,
                               digesterMode: self.digesterMode,

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -38,7 +38,7 @@ extension Driver {
     }
     addSupplementalOutput(path: objcGeneratedHeaderPath, flag: "-emit-objc-header-path", type: .objcHeader)
     addSupplementalOutput(path: tbdPath, flag: "-emit-tbd-path", type: .tbd)
-    addSupplementalOutput(path: apiDescriptorFilePath, flag: "-emit-api-descriptor-path", type: .jsonAPIDescriptor)
+    addSupplementalOutput(path: moduleOutputPaths.apiDescriptorFilePath, flag: "-emit-api-descriptor-path", type: .jsonAPIDescriptor)
 
     if isMergeModule {
       return

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -706,7 +706,7 @@ extension Driver {
 
         try addOutputOfType(
           outputType: .jsonAPIDescriptor,
-          finalOutputPath: apiDescriptorFilePath,
+          finalOutputPath: moduleOutputPaths.apiDescriptorFilePath,
           input: nil,
           flag: "-emit-api-descriptor-path")
       }

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -4118,6 +4118,36 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssert(variantModuleJob.commandLine.contains(.path(.relative(try .init(validating: "foo.swiftmodule/variant.swiftsourceinfo")))))
       XCTAssertTrue(variantModuleJob.commandLine.contains(subsequence: [.flag("-o"), .path(.relative(try .init(validating: "foo.swiftmodule/variant.swiftmodule")))]))
     }
+
+#if os(macOS)
+    do {
+      try withTemporaryDirectory { path in
+        var env = ProcessEnv.vars
+        env["LD_TRACE_FILE"] = path.appending(component: ".LD_TRACE").nativePathString(escaped: false)
+        var driver = try Driver(args: ["swiftc",
+          "-target", "x86_64-apple-macosx10.14",
+          "-target-variant", "x86_64-apple-ios13.1-macabi",
+          "-emit-variant-module-path", "foo.swiftmodule/x86_64-apple-ios13.1-macabi.swiftmodule",
+          "-enable-library-evolution",
+          "-emit-module",
+          "foo.swift"], env: env)
+
+        let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+        let targetModuleJob = plannedJobs[0]
+        let variantModuleJob = plannedJobs[1]
+
+        XCTAssert(targetModuleJob.commandLine.contains(subsequence: [
+          .flag("-emit-api-descriptor-path"),
+          .path(.absolute(path.appending(components: "SDKDB", "foo.\(driver.frontendTargetInfo.target.moduleTriple.triple).swift.sdkdb"))),
+        ]))
+
+        XCTAssert(variantModuleJob.commandLine.contains(subsequence: [
+          .flag("-emit-api-descriptor-path"),
+          .path(.absolute(path.appending(components: "SDKDB", "foo.\(driver.frontendTargetInfo.targetVariant!.moduleTriple.triple).swift.sdkdb"))),
+        ]))
+      }
+    }
+#endif
   }
 
   func testValidDeprecatedTargetiOS() throws {