Merge pull request #1344 from apple/es-flag

Add ignorable private flag to driver to match changes in frontend

Author: elsh

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -23,10 +23,27 @@ import struct TSCBasic.RelativePath
 import var TSCBasic.localFileSystem
 import var TSCBasic.stderrStream
 
-func getModuleFlags(_ path: VirtualPath, _ ignorable: Bool) throws -> [String] {
+enum InterfaceFlagKind {
+  case regular, ignorable, ignorablePrivate
+
+  var string: String {
+    switch self {
+    case .regular:
+      return "swift-module-flags"
+    case .ignorable:
+      return "swift-module-flags-ignorable"
+    case .ignorablePrivate:
+      return "swift-module-flags-ignorable-private"
+    }
+  }
+}
+
+func getModuleFlags(_ path: VirtualPath,
+                    _ flagKind: InterfaceFlagKind) throws -> [String] {
   let data = try localFileSystem.readFileContents(path).cString
   let myStrings = data.components(separatedBy: .newlines)
-  let prefix = ignorable ? "// swift-module-flags-ignorable: " : "// swift-module-flags: "
+
+  let prefix = "// " + flagKind.string + ": "
   if let argLine = myStrings.first(where: { $0.hasPrefix(prefix) }) {
     return argLine.dropFirst(prefix.count).components(separatedBy: " ")
   }
@@ -35,8 +52,9 @@ func getModuleFlags(_ path: VirtualPath, _ ignorable: Bool) throws -> [String] {
 
 @_spi(Testing) public func getAllModuleFlags(_ path: VirtualPath) throws -> [String] {
   var allFlags: [String] = []
-  allFlags.append(contentsOf: try getModuleFlags(path, true))
-  allFlags.append(contentsOf: try getModuleFlags(path, false))
+  allFlags.append(contentsOf: try getModuleFlags(path, .regular))
+  allFlags.append(contentsOf: try getModuleFlags(path, .ignorable))
+  allFlags.append(contentsOf: try getModuleFlags(path, .ignorablePrivate))
   return allFlags;
 }
 

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -6433,6 +6433,21 @@ final class SwiftDriverTests: XCTestCase {
     }
   }
 
+  func testExtractPackageName() throws {
+    try withTemporaryFile { file in
+      try localFileSystem.writeFileContents(file.path) {
+        $0 <<< "// swift-module-flags: -target arm64e-apple-macos12.0" <<< "\n"
+        $0 <<< "// swift-module-flags-ignorable: -library-level api"
+        $0 <<< "// swift-module-flags-ignorable-private: -package-name myPkg"
+      }
+      let flags = try getAllModuleFlags(VirtualPath.absolute(file.path))
+      let idx = flags.firstIndex(of: "-package-name")
+      XCTAssertNotNil(idx)
+      XCTAssert(idx! + 1 < flags.count)
+      XCTAssertEqual(flags[idx! + 1], "myPkg")
+    }
+  }
+
   func testExtractLibraryLevel() throws {
     try withTemporaryFile { file in
       try localFileSystem.writeFileContents(file.path) { $0 <<< "// swift-module-flags: -library-level api" }