Merge pull request #889 from xymus/driver-check-api-only

Make -check-api-availability-only a driver flag and don't pass to verification jobs

Author: xymus

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -348,6 +348,7 @@ extension Driver {
     try commandLine.appendLast(.runtimeCompatibilityVersion, from: &parsedOptions)
     try commandLine.appendLast(.disableAutolinkingRuntimeCompatibilityDynamicReplacements, from: &parsedOptions)
     try commandLine.appendLast(.disableAutolinkingRuntimeCompatibilityConcurrency, from: &parsedOptions)
+    try commandLine.appendLast(.checkApiAvailabilityOnly, from: &parsedOptions)
 
     if compilerMode.isSingleCompilation {
       try commandLine.appendLast(.emitSymbolGraph, from: &parsedOptions)

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -84,6 +84,7 @@ extension Driver {
 
     try commandLine.appendLast(.emitSymbolGraph, from: &parsedOptions)
     try commandLine.appendLast(.emitSymbolGraphDir, from: &parsedOptions)
+    try commandLine.appendLast(.checkApiAvailabilityOnly, from: &parsedOptions)
 
     if parsedOptions.hasArgument(.parseAsLibrary, .emitLibrary) {
       commandLine.appendFlag(.parseAsLibrary)

Sources/SwiftOptions/Options.swift

@@ -48,7 +48,7 @@ extension Option {
   public static let buildModuleFromParseableInterface: Option = Option("-build-module-from-parseable-interface", .flag, alias: Option.compileModuleFromInterface, attributes: [.helpHidden, .frontend, .noDriver], group: .modes)
   public static let bypassBatchModeChecks: Option = Option("-bypass-batch-mode-checks", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Bypass checks for batch-mode errors.")
   public static let candidateModuleFile: Option = Option("-candidate-module-file", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "<path>", helpText: "Specify Swift module may be ready to use for an interface")
-  public static let checkApiAvailabilityOnly: Option = Option("-check-api-availability-only", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Only check the availability of the APIs, ignore function bodies")
+  public static let checkApiAvailabilityOnly: Option = Option("-check-api-availability-only", .flag, attributes: [.helpHidden, .frontend, .noInteractive], helpText: "Only check the availability of the APIs, ignore function bodies")
   public static let checkOnoneCompleteness: Option = Option("-check-onone-completeness", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Print errors if the compile OnoneSupport module is missing symbols")
   public static let clangTarget: Option = Option("-clang-target", .separate, attributes: [.frontend], helpText: "Separately set the target we should use for internal Clang instance")
   public static let codeCompleteCallPatternHeuristics: Option = Option("-code-complete-call-pattern-heuristics", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Use heuristics to guess whether we want call pattern completions")

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -4282,6 +4282,23 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(plannedJobs.count, 1)
       XCTAssertEqual(plannedJobs[0].kind, .compile)
     }
+
+    // The flag -check-api-availability-only is not passed down to the verify job.
+    do {
+      var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name",
+                                     "foo", "-emit-module-interface",
+                                     "-verify-emitted-module-interface",
+                                     "-enable-library-evolution",
+                                     "-check-api-availability-only"])
+      let plannedJobs = try driver.planBuild()
+      XCTAssertEqual(plannedJobs.count, 2)
+
+      let emitJob = plannedJobs.first(where: { $0.kind == .emitModule })!
+      XCTAssertTrue(emitJob.commandLine.contains(.flag("-check-api-availability-only")))
+
+      let verifyJob = plannedJobs.first(where: { $0.kind == .verifyModuleInterface })!
+      XCTAssertFalse(verifyJob.commandLine.contains(.flag("-check-api-availability-only")))
+    }
   }
 
   func testPCHGeneration() throws {