Merge pull request #2010 from egorzhdan/egorzhdan/clang-access-flag

[cxx-interop] Add driver support for `-emit-clang-header-min-access`

Author: egorzhdan

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -385,6 +385,10 @@ extension Driver {
       try commandLine.appendLast(.clangBuildSessionFile, from: &parsedOptions)
     }
 
+    if isFrontendArgSupported(.emitClangHeaderMinAccess) {
+      try commandLine.appendLast(.emitClangHeaderMinAccess, from: &parsedOptions)
+    }
+
     if isFrontendArgSupported(.enableBuiltinModule) {
       try commandLine.appendLast(.enableBuiltinModule, from: &parsedOptions)
     }

Sources/SwiftOptions/Options.swift

@@ -350,7 +350,7 @@ extension Option {
   public static let emitAssembly: Option = Option("-emit-assembly", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit assembly file(s) (-S)", group: .modes)
   public static let emitAst: Option = Option("-emit-ast", .flag, alias: Option.dumpAst, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild])
   public static let emitBc: Option = Option("-emit-bc", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit LLVM BC file(s)", group: .modes)
-  public static let emitClangHeaderMinAccess: Option = Option("-emit-clang-header-min-access", .separate, attributes: [.frontend, .noInteractive, .argumentIsPath, .cacheInvariant], metaVar: "<access-level>", helpText: "The minimum access level of declarations to include in the emitted header.>")
+  public static let emitClangHeaderMinAccess: Option = Option("-emit-clang-header-min-access", .separate, attributes: [.frontend, .noInteractive, .cacheInvariant], metaVar: "<access-level>", helpText: "The minimum access level of declarations to include in the emitted header")
   public static let emitClangHeaderNonmodularIncludes: Option = Option("-emit-clang-header-nonmodular-includes", .flag, attributes: [.frontend, .noInteractive, .supplementaryOutput], helpText: "Augment emitted Objective-C header with textual imports for every included modular import")
   public static let emitClangHeaderPath: Option = Option("-emit-clang-header-path", .separate, alias: Option.emitObjcHeaderPath, attributes: [.frontend, .noInteractive, .argumentIsPath, .supplementaryOutput, .cacheInvariant], helpText: "Emit an Objective-C and C++ header file to <path>")
   public static let emitConstValuesPath: Option = Option("-emit-const-values-path", .separate, attributes: [.frontend, .noInteractive, .argumentIsPath, .supplementaryOutput, .cacheInvariant], metaVar: "<path>", helpText: "Emit the extracted compile-time known values to <path>")

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -7983,6 +7983,16 @@ final class SwiftDriverTests: XCTestCase {
       try XCTAssertJobInvocationMatches(jobs[0], .flag("-emit-objc-header-path"), toPathOption("path/to/header"))
   }
 
+  func testEmitClangHeaderMinAccess() throws {
+      VirtualPath.resetTemporaryFileStore()
+      var driver = try Driver(args: [
+        "swiftc", "-emit-clang-header-path", "path/to/header", "-emit-clang-header-min-access", "public", "-typecheck", "test.swift"
+      ])
+      let jobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(jobs.count, 2)
+      try XCTAssertJobInvocationMatches(jobs[0], .flag("-emit-clang-header-min-access"), .flag("public"))
+  }
+
   func testGccToolchainFlags() throws {
       VirtualPath.resetTemporaryFileStore()
       var driver = try Driver(args: [