Fix a number of callsites to get ConfiguredTarget settings from the GlobalProductPlan instead of the BuildRequestContext

Author: owenv

Sources/SWBCore/WorkspaceSettingsCache.swift

@@ -70,7 +70,7 @@ final class WorkspaceSettingsCache: Sendable {
     }
 
     /// Get the cached settings for the given parameters, without considering the context of any project/target.
-    public func getCachedSettings(_ parameters: BuildParameters, buildRequestContext: BuildRequestContext, purpose: SettingsPurpose = .build, filesSignature: ([Path]) -> FilesSignature) -> Settings {
+    public func getCachedSettings(_ parameters: BuildParameters, buildRequestContext: BuildRequestContext, purpose: SettingsPurpose, filesSignature: ([Path]) -> FilesSignature) -> Settings {
         let key = SettingsCacheKey(parameters: parameters, projectGUID: nil, targetGUID: nil, purpose: purpose, provisioningTaskInputs: nil, impartedBuildProperties: nil)
 
         // Check if there were any changes in used xcconfigs
@@ -80,20 +80,10 @@ final class WorkspaceSettingsCache: Sendable {
         }
     }
 
-    /// Get the cached settings for the given parameters and project.
-    public func getCachedSettings(_ parameters: BuildParameters, project: Project, purpose: SettingsPurpose = .build, provisioningTaskInputs: ProvisioningTaskInputs? = nil, impartedBuildProperties: [ImpartedBuildProperties]? = nil, buildRequestContext: BuildRequestContext, filesSignature: ([Path]) -> FilesSignature) -> Settings {
-        return getCachedSettings(parameters, project: project, target: nil, purpose: purpose, provisioningTaskInputs: provisioningTaskInputs, impartedBuildProperties: impartedBuildProperties, buildRequestContext: buildRequestContext, filesSignature: filesSignature)
-    }
-
-    /// Get the cached settings for the given parameters and target.
-    public func getCachedSettings(_ parameters: BuildParameters, target: Target, purpose: SettingsPurpose = .build, provisioningTaskInputs: ProvisioningTaskInputs? = nil, impartedBuildProperties: [ImpartedBuildProperties]? = nil, buildRequestContext: BuildRequestContext, filesSignature: ([Path]) -> FilesSignature) -> Settings {
-        return getCachedSettings(parameters, project: workspaceContext.workspace.project(for: target), target: target, purpose: purpose, provisioningTaskInputs: provisioningTaskInputs, impartedBuildProperties: impartedBuildProperties, buildRequestContext: buildRequestContext, filesSignature: filesSignature)
-    }
-
     /// Private method to get the cached settings for the given parameters, project, and target.
     ///
     /// - remark: This is internal so that clients don't somehow call this with a project which doesn't match the target, except for `BuildRequestContext` which has a cover method for it.  There are public methods covering this one.
-    internal func getCachedSettings(_ parameters: BuildParameters, project: Project, target: Target? = nil, purpose: SettingsPurpose = .build, provisioningTaskInputs: ProvisioningTaskInputs? = nil, impartedBuildProperties: [ImpartedBuildProperties]? = nil, buildRequestContext: BuildRequestContext, filesSignature: ([Path]) -> FilesSignature) -> Settings {
+    internal func getCachedSettings(_ parameters: BuildParameters, project: Project, target: Target?, purpose: SettingsPurpose, provisioningTaskInputs: ProvisioningTaskInputs?, impartedBuildProperties: [ImpartedBuildProperties]?, buildRequestContext: BuildRequestContext, filesSignature: ([Path]) -> FilesSignature) -> Settings {
         let key = SettingsCacheKey(parameters: parameters, projectGUID: project.guid, targetGUID: target?.guid, purpose: purpose, provisioningTaskInputs: provisioningTaskInputs, impartedBuildProperties: impartedBuildProperties)
 
         // Check if there were any changes in used xcconfigs

Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift

@@ -290,7 +290,7 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                     }
                 }
             }
-            let settings = context.globalProductPlan.planRequest.buildRequestContext.getCachedSettings(producingTarget.parameters, target: producingTarget.target)
+            let settings = context.globalProductPlan.getTargetSettings(producingTarget)
             // We want to not exclude the binary if DONT_EMBED_REEXPORTED_MERGEABLE_LIBRARIES is enabled in debug builds.  If we get here then we know this is a mergeable library, but if MAKE_MERGEABLE is enabled on the producing target then we expect this to be a debug build.  (We want to check MAKE_MERGEABLE because it's possible that setting was enabled manually, and in that case DONT_EMBED_REEXPORTED_MERGEABLE_LIBRARIES doesn't apply.)
             if !settings.globalScope.evaluate(BuiltinMacros.MAKE_MERGEABLE) && scope.evaluate(BuiltinMacros.DONT_EMBED_REEXPORTED_MERGEABLE_LIBRARIES) {
                 shouldSkipCopyingBinary = false
@@ -336,7 +336,7 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                                         if let resolvedLinkedBuildFile = try? context.resolveBuildFileReference(linkedBuildFile), resolvedLinkedBuildFile.fileType.identifier == "wrapper.xcframework", resolvedBuildFile.absolutePath == resolvedLinkedBuildFile.absolutePath {
                                             // Here we know that this is an XCFramework which is being linked by us or one of our dependencies, and that this XCFramework is marked as mergeable.  So we decide what we want to do with it.
                                             didFindBuildFile = true
-                                            let cTargetSettings = context.globalProductPlan.planRequest.buildRequestContext.getCachedSettings(cTarget.parameters, target: cTarget.target)
+                                            let cTargetSettings = context.globalProductPlan.getTargetSettings(cTarget)
                                             let mergeLinkedLibraries = cTargetSettings.globalScope.evaluate(BuiltinMacros.MERGE_LINKED_LIBRARIES)
                                             if mergeLinkedLibraries {
                                                 shouldSkipCopyingBinary = true

Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift

@@ -1440,7 +1440,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                         // Compute the subpaths of the linked item we want to copy.  This means we need to get the scope for the producing target.
                         // FIXME: We should unify this as much as possible with the logic in CopyFilesTaskProducer.
                         if let producingTarget = context.globalProductPlan.productPathsToProducingTargets[libraryPath] {
-                            let copiedFileSettings = context.globalProductPlan.planRequest.buildRequestContext.getCachedSettings(producingTarget.parameters, target: producingTarget.target)
+                            let copiedFileSettings = context.globalProductPlan.getTargetSettings(producingTarget)
 
                             if let productType = copiedFileSettings.productType {
                                 // If this is a standalone binary product then we just copy it.  Otherwise PBXCp will include the subpaths we assemble here.

Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/InfoPlistTaskProducer.swift

@@ -295,7 +295,7 @@ extension TaskProducerContext {
         }
 
         return clients.compactMap {
-            let scope = self.globalProductPlan.planRequest.buildRequestContext.getCachedSettings($0.parameters, target: $0.target).globalScope
+            let scope = self.globalProductPlan.getTargetSettings($0).globalScope
             // Filter non-library clients.
             let machOType = scope.evaluate(BuiltinMacros.MACH_O_TYPE)
             guard ["mh_bundle", "mh_dylib", "mh_object", "staticlib"].contains(machOType) else {

Sources/SWBTaskExecution/BuildDescriptionManager.swift

@@ -193,7 +193,7 @@ package final class BuildDescriptionManager: Sendable {
         staleFileRemovalIdentifierPerTarget[nil] = plan.staleFileRemovalTaskIdentifier(for: nil)
 
         for target in buildGraph.allTargets {
-            let settings = planRequest.buildRequestContext.getCachedSettings(target.parameters, target: target.target)
+            let settings = plan.globalProductPlan.getTargetSettings(target)
             rootPathsPerTarget[target] = [
                 settings.globalScope.evaluate(BuiltinMacros.DSTROOT),
                 settings.globalScope.evaluate(BuiltinMacros.OBJROOT),
@@ -227,7 +227,7 @@ package final class BuildDescriptionManager: Sendable {
         let definingTargetsByModuleName = {
             var definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>] = [:]
             for target in buildGraph.allTargets {
-                let settings = planRequest.buildRequestContext.getCachedSettings(target.parameters, target: target.target)
+                let settings = plan.globalProductPlan.getTargetSettings(target)
                 let moduleInfo = plan.globalProductPlan.getModuleInfo(target)
                 let specLookupContext = SpecLookupCtxt(specRegistry: planRequest.workspaceContext.core.specRegistry, platform: settings.platform)
                 let buildingAnySwiftSourceFiles = (target.target as? BuildPhaseTarget)?.sourcesBuildPhase?.containsSwiftSources(planRequest.workspaceContext.workspace, specLookupContext, settings.globalScope, settings.filePathResolver) ?? false

Sources/SWBUniversalPlatform/TestEntryPointTaskProducer.swift

@@ -32,7 +32,7 @@ class TestEntryPointTaskProducer: PhasedTaskProducer, TaskProducer {
                 var indexUnitBasePaths: OrderedSet<Path> = []
                 var binaryPaths: OrderedSet<Path> = []
                 for directDependency in context.globalProductPlan.dependencies(of: configuredTarget) {
-                    let settings = context.globalProductPlan.planRequest.buildRequestContext.getCachedSettings(directDependency.parameters, target: directDependency.target)
+                    let settings = context.globalProductPlan.getTargetSettings(directDependency)
                     guard settings.productType?.conformsTo(identifier: "com.apple.product-type.bundle.unit-test") == true else {
                         continue
                     }