Merge pull request #1699 from xymus/public-module-name-flag

Pass down `-public-module-name` to the frontend

Author: xymus

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -339,6 +339,10 @@ extension Driver {
       commandLine.appendFlag(ver)
     }
 
+    if isFrontendArgSupported(.publicModuleName) {
+      try commandLine.appendLast(.publicModuleName, from: &parsedOptions)
+    }
+
     // Pass down -validate-clang-modules-once if we are working with a compiler that
     // supports it.
     if isFrontendArgSupported(.validateClangModulesOnce),

Sources/SwiftOptions/Options.swift

@@ -705,6 +705,7 @@ extension Option {
   public static let protocolRequirementAllowList: Option = Option("-protocol-requirement-allow-list", .separate, attributes: [.noDriver, .argumentIsPath], metaVar: "<path>", helpText: "File containing a new-line separated list of protocol names")
   public static let protocolRequirementAllowList_: Option = Option("--protocol-requirement-allow-list", .separate, alias: Option.protocolRequirementAllowList, attributes: [.noDriver, .argumentIsPath], metaVar: "<path>", helpText: "File containing a new-line separated list of protocol names")
   public static let publicAutolinkLibrary: Option = Option("-public-autolink-library", .separate, attributes: [.helpHidden, .frontend, .noDriver, .moduleInterface], helpText: "Add public dependent library")
+  public static let publicModuleName: Option = Option("-public-module-name", .separate, attributes: [.frontend], helpText: "Public facing module name to use in diagnostics and documentation")
   public static let RaccessNoteEQ: Option = Option("-Raccess-note=", .joined, alias: Option.RaccessNote, attributes: [.frontend, .noDriver])
   public static let RaccessNote: Option = Option("-Raccess-note", .separate, attributes: [.frontend, .noDriver], metaVar: "none|failures|all|all-validate", helpText: "Control access note remarks (default: all)")
   public static let cacheRemarks: Option = Option("-Rcache-compile-job", .flag, attributes: [.frontend, .cacheInvariant], helpText: "Show remarks for compiler caching")
@@ -1581,6 +1582,7 @@ extension Option {
       Option.protocolRequirementAllowList,
       Option.protocolRequirementAllowList_,
       Option.publicAutolinkLibrary,
+      Option.publicModuleName,
       Option.RaccessNoteEQ,
       Option.RaccessNote,
       Option.cacheRemarks,

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -837,6 +837,22 @@ final class SwiftDriverTests: XCTestCase {
     XCTAssert(compileJob.commandLine.contains(.flag("ABIMod")))
   }
 
+  func testPublicModuleName() throws {
+    var driver = try Driver(
+      args: ["swiftc", "foo.swift", "-public-module-name", "PublicFacing"]
+    )
+    let jobs = try driver.planBuild()
+    let compileJob = try jobs.findJob(.compile)
+
+    if driver.isFrontendArgSupported(.publicModuleName) {
+      XCTAssert(compileJob.commandLine.contains(.flag("-public-module-name")))
+      XCTAssert(compileJob.commandLine.contains(.flag("PublicFacing")))
+    } else {
+      XCTAssertFalse(compileJob.commandLine.contains(.flag("-public-module-name")))
+      XCTAssertFalse(compileJob.commandLine.contains(.flag("PublicFacing")))
+    }
+  }
+
   func testStandardCompileJobs() throws {
     var driver1 = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test"])
     let plannedJobs = try driver1.planBuild().removingAutolinkExtractJobs()