Move updateConfiguration out of package diamond detection loop

Author: yimajo

Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift

@@ -936,37 +936,6 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             // This only suppresses duplicate diagnostics.
             var packageTargetsToIgnore = Set<ConfiguredTarget>()
 
-            let updateConfiguration = { (configuredTarget: ConfiguredTarget, dynamicTarget: SWBCore.Target) in
-                // If the `targetTaskInfo` for the static target isn't present, we already made the decision to make this target dynamic.
-                if self.targetGateNodes[configuredTarget] == nil { return }
-
-                // There can be multiple configured targets for the dynamic target, we have to update all of them.
-                let matchingConfiguredTargets = self.targetGateNodes.keys.filter { $0.target.guid == configuredTarget.target.guid }
-
-                for matchingTarget in matchingConfiguredTargets {
-                    guard let taskInfo = self.targetGateNodes[matchingTarget] else { return }
-                    let dynamicConfiguredTarget = matchingTarget.replacingTarget(dynamicTarget)
-
-                    self.targetGateNodes.removeValue(forKey: matchingTarget)
-                    self.targetGateNodes[dynamicConfiguredTarget] = taskInfo
-
-                    let impartedBuildProperties = self.impartedBuildPropertiesByTarget[matchingTarget]
-                    self.impartedBuildPropertiesByTarget.removeValue(forKey: matchingTarget)
-                    self.impartedBuildPropertiesByTarget[dynamicConfiguredTarget] = impartedBuildProperties
-
-                    let descriptors = self.swiftMacroImplementationDescriptorsByTarget.removeValue(forKey: matchingTarget)
-                    self.swiftMacroImplementationDescriptorsByTarget[dynamicConfiguredTarget] = descriptors
-
-                    if self.targetsRequiredToBuildForIndexing.remove(matchingTarget) != nil {
-                        self.targetsRequiredToBuildForIndexing.insert(dynamicConfiguredTarget)
-                    }
-
-                    if self.targetsWhichShouldBuildModulesDuringInstallAPI?.remove(matchingTarget) != nil {
-                        self.targetsWhichShouldBuildModulesDuringInstallAPI?.insert(dynamicConfiguredTarget)
-                    }
-                }
-            }
-
             for (product, topLevelTargets) in packageLinkingTargets.products {
                 if let andOther = checkLinkage(topLevelTargets: topLevelTargets) {
                     packageTargetsToIgnore.formUnion(dependenciesByTarget[product]?.map { $0.target } ?? [])
@@ -1002,6 +971,37 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
 
         // MARK: - Apply the collected replacement candidates to the build graph
 
+        let updateConfiguration = { (configuredTarget: ConfiguredTarget, dynamicTarget: SWBCore.Target) in
+            // If the `targetTaskInfo` for the static target isn't present, we already made the decision to make this target dynamic.
+            if self.targetGateNodes[configuredTarget] == nil { return }
+
+            // There can be multiple configured targets for the dynamic target, we have to update all of them.
+            let matchingConfiguredTargets = self.targetGateNodes.keys.filter { $0.target.guid == configuredTarget.target.guid }
+
+            for matchingTarget in matchingConfiguredTargets {
+                guard let taskInfo = self.targetGateNodes[matchingTarget] else { return }
+                let dynamicConfiguredTarget = matchingTarget.replacingTarget(dynamicTarget)
+
+                self.targetGateNodes.removeValue(forKey: matchingTarget)
+                self.targetGateNodes[dynamicConfiguredTarget] = taskInfo
+
+                let impartedBuildProperties = self.impartedBuildPropertiesByTarget[matchingTarget]
+                self.impartedBuildPropertiesByTarget.removeValue(forKey: matchingTarget)
+                self.impartedBuildPropertiesByTarget[dynamicConfiguredTarget] = impartedBuildProperties
+
+                let descriptors = self.swiftMacroImplementationDescriptorsByTarget.removeValue(forKey: matchingTarget)
+                self.swiftMacroImplementationDescriptorsByTarget[dynamicConfiguredTarget] = descriptors
+
+                if self.targetsRequiredToBuildForIndexing.remove(matchingTarget) != nil {
+                    self.targetsRequiredToBuildForIndexing.insert(dynamicConfiguredTarget)
+                }
+
+                if self.targetsWhichShouldBuildModulesDuringInstallAPI?.remove(matchingTarget) != nil {
+                    self.targetsWhichShouldBuildModulesDuringInstallAPI?.insert(dynamicConfiguredTarget)
+                }
+            }
+        }
+
         for (product, (packageProductTarget, dynamicTarget)) in packageDiamondUpdates.productsToBuildDynamically {
             updateConfiguration(product, dynamicTarget)
             self.dynamicallyBuildingTargetsWithDiamondLinkage[packageProductTarget] = dynamicTarget