PrebuiltModuleGen: add additional framework search paths

Author: nkcsgexi

Sources/SwiftDriver/Driver/Driver.swift

@@ -349,13 +349,20 @@ public struct Driver {
     return VirtualPath.lookup(rawSdkPath)
   } ()
 
-  lazy var iosMacFrameworksSearchPath: VirtualPath = {
+  lazy var iosMacFrameworksBase: VirtualPath = {
     sdkPath!
       .appending(component: "System")
       .appending(component: "iOSSupport")
       .appending(component: "System")
       .appending(component: "Library")
-      .appending(component: "Frameworks")
+  } ()
+
+  lazy var iosMacFrameworksSearchPath: VirtualPath = {
+    iosMacFrameworksBase.appending(component: "Frameworks")
+  } ()
+
+  lazy var iosMacPrivateFrameworksSearchPath: VirtualPath = {
+    iosMacFrameworksBase.appending(component: "PrivateFrameworks")
   } ()
 
   lazy var abiDescriptorPath: TypedVirtualPath? = {

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -248,7 +248,9 @@ public struct SDKPrebuiltModuleInputsCollector {
   let nonFrameworkDirs = [RelativePath("usr/lib/swift"),
                           RelativePath("System/iOSSupport/usr/lib/swift")]
   let frameworkDirs = [RelativePath("System/Library/Frameworks"),
-                      RelativePath("System/iOSSupport/System/Library/Frameworks")]
+                       RelativePath("System/Library/PrivateFrameworks"),
+                       RelativePath("System/iOSSupport/System/Library/Frameworks"),
+                       RelativePath("System/iOSSupport/System/Library/PrivateFrameworks")]
   let sdkInfo: DarwinToolchain.DarwinSDKInfo
   let diagEngine: DiagnosticsEngine
   public init(_ sdkPath: AbsolutePath, _ diagEngine: DiagnosticsEngine) {
@@ -448,10 +450,12 @@ extension Driver {
                                                         _ dependencies: [TypedVirtualPath], _ currentABIDir: AbsolutePath?,
                                                         _ baselineABIDir: AbsolutePath?) throws -> [Job] {
     assert(inputPath.path.file.basenameWithoutExt == outputPath.path.file.basenameWithoutExt)
+    let sdkPath = sdkPath!
+    let isInternal = sdkPath.basename.hasSuffix(".Internal.sdk")
     var commandLine: [Job.ArgTemplate] = []
     commandLine.appendFlag(.compileModuleFromInterface)
     commandLine.appendFlag(.sdk)
-    commandLine.append(.path(sdkPath!))
+    commandLine.append(.path(sdkPath))
     commandLine.appendFlag(.prebuiltModuleCachePath)
     commandLine.appendPath(prebuiltModuleDir)
     commandLine.appendFlag(.moduleName)
@@ -467,6 +471,16 @@ extension Driver {
     if try isIosMacInterface(inputPath.path.file) {
       commandLine.appendFlag(.Fsystem)
       commandLine.append(.path(iosMacFrameworksSearchPath))
+      if isInternal {
+        commandLine.appendFlag(.Fsystem)
+        commandLine.append(.path(iosMacPrivateFrameworksSearchPath))
+      }
+    }
+    if isInternal {
+      commandLine.appendFlag(.Fsystem)
+      commandLine.append(.path(sdkPath.appending(component: "System")
+        .appending(component: "Library")
+        .appending(component: "PrivateFrameworks")))
     }
     // Use the specified module cache dir
     if let mcp = parsedOptions.getLastArgument(.moduleCachePath)?.asSingle {

TestInputs/mock-sdk.Internal.sdk/SDKSettings.json

@@ -0,0 +1,8 @@
+{
+	"Version": "10.15",
+	"VersionMap": {
+		"macOS_iOSMac": {},
+		"iOSMac_macOS": {}
+	},
+	"CanonicalName": "macosx10.15"
+}

TestInputs/mock-sdk.Internal.sdk/usr/lib/swift/A.swiftmodule/arm64-apple-macos.swiftinterface

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

TestInputs/mock-sdk.Internal.sdk/usr/lib/swift/A.swiftmodule/arm64e-apple-macos.swiftinterface

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

TestInputs/mock-sdk.Internal.sdk/usr/lib/swift/A.swiftmodule/x86_64-apple-macos.swiftinterface

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

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -1510,5 +1510,31 @@ final class ExplicitModuleBuildTests: XCTestCase {
       try abiCheckJobs.forEach { try checkABICheckingJob($0) }
     }
   }
+  func testPrebuiltModuleIntenralSDK() throws {
+    let mockSDKPath = testInputsPath.appending(component: "mock-sdk.Internal.sdk")
+    let mockSDKPathStr: String = mockSDKPath.pathString
+    let collector = try SDKPrebuiltModuleInputsCollector(VirtualPath(path: mockSDKPathStr).absolutePath!, DiagnosticsEngine())
+    let interfaceMap = try collector.collectSwiftInterfaceMap()
+    try withTemporaryDirectory { path in
+      let main = path.appending(component: "testPrebuiltModuleGenerationJobs.swift")
+      try localFileSystem.writeFileContents(main) {
+        $0 <<< "import A\n"
+      }
+      let moduleCachePath = "/tmp/module-cache"
+      var driver = try Driver(args: ["swiftc", main.pathString,
+                                     "-sdk", mockSDKPathStr,
+                                     "-module-cache-path", moduleCachePath
+                                    ])
+      let (jobs, _) = try driver.generatePrebuitModuleGenerationJobs(with: interfaceMap,
+                                                                     into: path,
+                                                                     exhaustive: true)
+      let compileJobs = jobs.filter {$0.kind == .compile}
+      XCTAssertTrue(!compileJobs.isEmpty)
+      XCTAssertTrue(compileJobs.allSatisfy { $0.commandLine.contains(.flag("-suppress-warnings")) })
+      let PFPath = mockSDKPath.appending(component: "System").appending(component: "Library")
+        .appending(component: "PrivateFrameworks")
+      XCTAssertTrue(compileJobs.allSatisfy { $0.commandLine.contains(.path(VirtualPath.absolute(PFPath))) })
+    }
+  }
 #endif
 }