Merge pull request #1041 from nkcsgexi/hasprivate-interface

AdopterAnalysis: keep track of whether private interfaces are discovered

Author: nkcsgexi

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -246,14 +246,16 @@ public class SwiftAdopter: Codable {
   public let name: String
   public let moduleDir: String
   public let hasInterface: Bool
+  public let hasPrivateInterface: Bool
   public let hasModule: Bool
   public let isFramework: Bool
   public let isPrivate: Bool
-  init(_ name: String, _ moduleDir: AbsolutePath, _ hasInterface: AbsolutePath?, _ hasModule: AbsolutePath?) {
+  init(_ name: String, _ moduleDir: AbsolutePath, _ hasInterface: [AbsolutePath], _ hasModule: [AbsolutePath]) {
     self.name = name
     self.moduleDir = SwiftAdopter.relativeToSDK(moduleDir)
-    self.hasInterface = hasInterface != nil
-    self.hasModule = hasModule != nil
+    self.hasInterface = !hasInterface.isEmpty
+    self.hasPrivateInterface = hasInterface.contains { $0.basename.hasSuffix(".private.swiftinterface") }
+    self.hasModule = !hasModule.isEmpty
     self.isFramework = self.moduleDir.contains("\(name).framework")
     self.isPrivate = self.moduleDir.contains("PrivateFrameworks")
   }
@@ -349,8 +351,8 @@ public struct SDKPrebuiltModuleInputsCollector {
       if results[moduleName] == nil {
         results[moduleName] = []
       }
-      var hasInterface: AbsolutePath?
-      var hasModule: AbsolutePath?
+      var hasInterface: [AbsolutePath] = []
+      var hasModule: [AbsolutePath] = []
       // Search inside a .swiftmodule directory for any .swiftinterface file, and
       // add the files into the dictionary.
       // Duplicate entries are discarded, otherwise llbuild will complain.
@@ -363,11 +365,11 @@ public struct SDKPrebuiltModuleInputsCollector {
           if !results[moduleName]!.contains(where: { $0.path.file.basenameWithoutExt == currentBaseName }) {
             results[moduleName]!.append(PrebuiltModuleInput(interfacePath))
           }
-          hasInterface = currentFile
+          hasInterface.append(currentFile)
         }
         if currentFile.extension == "swiftmodule" {
           diagEngine.emit(warning: "found \(currentFile)")
-          hasModule = currentFile
+          hasModule.append(currentFile)
         }
       }
       allSwiftAdopters.append(SwiftAdopter(moduleName, dir, hasInterface, hasModule))

TestInputs/mock-sdk.Internal.sdk/System/Library/Frameworks/B.framework/Modules/B.swiftmodule/arm64-apple-macos.private.swiftinterface

@@ -0,0 +1,4 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name E
+import Swift
+public func FuncE() { }

TestInputs/mock-sdk.Internal.sdk/System/Library/Frameworks/B.framework/Modules/B.swiftmodule/arm64-apple-macos.swiftinterface

@@ -0,0 +1,4 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name E
+import Swift
+public func FuncE() { }

TestInputs/mock-sdk.Internal.sdk/System/Library/Frameworks/B.framework/Modules/B.swiftmodule/arm64e-apple-macos.swiftinterface

@@ -0,0 +1,4 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name E
+import Swift
+public func FuncE() { }

TestInputs/mock-sdk.Internal.sdk/System/Library/Frameworks/B.framework/Modules/B.swiftmodule/x86_64-apple-macos.swiftinterface

@@ -0,0 +1,4 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name E
+import Swift
+public func FuncE() { }

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -1546,7 +1546,14 @@ final class ExplicitModuleBuildTests: XCTestCase {
     XCTAssertFalse(A.isFramework)
     XCTAssertFalse(A.isPrivate)
     XCTAssertFalse(A.hasModule)
+    XCTAssertFalse(A.hasPrivateInterface)
     XCTAssertTrue(A.hasInterface)
+
+    let B = adopters.first {$0.name == "B"}!
+    XCTAssertTrue(B.isFramework)
+    XCTAssertFalse(B.isPrivate)
+    XCTAssertFalse(B.hasModule)
+    XCTAssertTrue(B.hasPrivateInterface)
   }
 #endif
 }