[Build/Commands] NFC: Replace more uses of buildTriple with build parameters

Author: xedin

Sources/Build/BuildOperation.swift

@@ -638,7 +638,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
             ) { name, path in
                 try buildOperationForPluginDependencies.build(subset: .product(name, for: .host))
                 if let builtTool = try buildOperationForPluginDependencies.buildPlan.buildProducts.first(where: {
-                    $0.product.name == name && $0.product.buildTriple == .tools
+                    $0.product.name == name && $0.buildParameters.destination == .host
                 }) {
                     return try builtTool.binaryPath
                 } else {

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -383,7 +383,7 @@ public struct BuildDescription: Codable {
             .explicitTargetDependencyImportCheckingMode
         self.targetDependencyMap = try plan.targets.reduce(into: [TargetName: [TargetName]]()) { partial, targetBuildDescription in
             let deps = try targetBuildDescription.target.recursiveDependencies(
-                satisfying: plan.buildParameters(for: targetBuildDescription.target).buildEnvironment
+                satisfying: targetBuildDescription.buildParameters.buildEnvironment
             )
                 .compactMap(\.target).map(\.c99name)
             partial[targetBuildDescription.target.c99name] = deps

Sources/Build/BuildPlan/BuildPlan+Test.swift

@@ -16,6 +16,7 @@ import struct Basics.AbsolutePath
 import struct LLBuildManifest.TestDiscoveryTool
 import struct LLBuildManifest.TestEntryPointTool
 import struct PackageGraph.ModulesGraph
+import struct PackageGraph.ResolvedPackage
 import struct PackageGraph.ResolvedProduct
 import struct PackageGraph.ResolvedModule
 import struct PackageModel.Sources
@@ -26,9 +27,9 @@ import protocol TSCBasic.FileSystem
 
 extension BuildPlan {
     static func makeDerivedTestTargets(
+        testProducts: [(product: ResolvedProduct, buildDescription: ProductBuildDescription)],
         destinationBuildParameters: BuildParameters,
         toolsBuildParameters: BuildParameters,
-        _ graph: ModulesGraph,
         shouldDisableSandbox: Bool,
         _ fileSystem: FileSystem,
         _ observabilityScope: ObservabilityScope
@@ -44,15 +45,14 @@ extension BuildPlan {
 
         var isDiscoveryEnabledRedundantly = explicitlyEnabledDiscovery && !isEntryPointPathSpecifiedExplicitly
         var result: [(ResolvedProduct, SwiftTargetBuildDescription?, SwiftTargetBuildDescription)] = []
-        for testProduct in graph.allProducts where testProduct.type == .test {
-            guard let package = graph.package(for: testProduct) else {
-                throw InternalError("package not found for \(testProduct)")
-            }
+        for (testProduct, testBuildDescription) in testProducts {
+            let package = testBuildDescription.package
+
             isDiscoveryEnabledRedundantly = isDiscoveryEnabledRedundantly && nil == testProduct.testEntryPointTarget
             // If a non-explicitly specified test entry point file exists, prefer that over test discovery.
             // This is designed as an escape hatch when test discovery is not appropriate and for backwards
             // compatibility for projects that have existing test entry point files (e.g. XCTMain.swift, LinuxMain.swift).
-            let toolsVersion = graph.package(for: testProduct)?.manifest.toolsVersion ?? .v5_5
+            let toolsVersion = package.manifest.toolsVersion
 
             // If `testProduct.testEntryPointTarget` is non-nil, it may either represent an `XCTMain.swift` (formerly `LinuxMain.swift`) file
             // if such a file is located in the package, or it may represent a test entry point file at a path specified by the option
@@ -93,20 +93,13 @@ extension BuildPlan {
                     supportedPlatforms: testProduct.supportedPlatforms,
                     platformVersionProvider: testProduct.platformVersionProvider
                 )
-
                 discoveryResolvedTarget.buildTriple = testProduct.buildTriple
-                let discoveryTargetBuildParameters: BuildParameters
-                switch discoveryResolvedTarget.buildTriple {
-                case .tools:
-                    discoveryTargetBuildParameters = toolsBuildParameters
-                case .destination:
-                    discoveryTargetBuildParameters = destinationBuildParameters
-                }
+
                 let discoveryTargetBuildDescription = try SwiftTargetBuildDescription(
                     package: package,
                     target: discoveryResolvedTarget,
                     toolsVersion: toolsVersion,
-                    buildParameters: discoveryTargetBuildParameters,
+                    buildParameters: testBuildDescription.buildParameters,
                     testTargetRole: .discovery,
                     shouldDisableSandbox: shouldDisableSandbox,
                     fileSystem: fileSystem,
@@ -143,19 +136,12 @@ extension BuildPlan {
                     platformVersionProvider: testProduct.platformVersionProvider
                 )
                 entryPointResolvedTarget.buildTriple = testProduct.buildTriple
-                let entryPointBuildParameters: BuildParameters
-                switch entryPointResolvedTarget.buildTriple {
-                case .tools:
-                    entryPointBuildParameters = toolsBuildParameters
-                case .destination:
-                    entryPointBuildParameters = destinationBuildParameters
-                }
 
                 return try SwiftTargetBuildDescription(
                     package: package,
                     target: entryPointResolvedTarget,
                     toolsVersion: toolsVersion,
-                    buildParameters: entryPointBuildParameters,
+                    buildParameters: testBuildDescription.buildParameters,
                     testTargetRole: .entryPoint(isSynthesized: true),
                     shouldDisableSandbox: shouldDisableSandbox,
                     fileSystem: fileSystem,

Sources/Build/BuildPlan/BuildPlan.swift

@@ -439,9 +439,11 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
         // Plan the derived test targets, if necessary.
         if destinationBuildParameters.testingParameters.testProductStyle.requiresAdditionalDerivedTestTargets {
             let derivedTestTargets = try Self.makeDerivedTestTargets(
+                testProducts: productMap.values.filter {
+                    $0.product.type == .test
+                },
                 destinationBuildParameters: destinationBuildParameters,
                 toolsBuildParameters: toolsBuildParameters,
-                graph,
                 shouldDisableSandbox: self.shouldDisableSandbox,
                 self.fileSystem,
                 self.observabilityScope

Sources/Commands/PackageCommands/DumpCommands.swift

@@ -72,6 +72,7 @@ struct DumpSymbolGraph: SwiftCommand {
             let result = try symbolGraphExtractor.extractSymbolGraph(
                 module: target,
                 buildPlan: buildPlan,
+                buildParameters: buildPlan.destinationBuildParameters,
                 outputRedirection: .collect(redirectStderr: true),
                 outputDirectory: symbolGraphDirectory,
                 verboseOutput: swiftCommandState.logLevel <= .info

Sources/Commands/PackageCommands/PluginCommand.swift

@@ -336,7 +336,7 @@ struct PluginCommand: SwiftCommand {
             // Build the product referenced by the tool, and add the executable to the tool map. Product dependencies are not supported within a package, so if the tool happens to be from the same package, we instead find the executable that corresponds to the product. There is always one, because of autogeneration of implicit executables with the same name as the target if there isn't an explicit one.
             try buildSystem.build(subset: .product(name, for: .host))
             if let builtTool = try buildSystem.buildPlan.buildProducts.first(where: {
-                $0.product.name == name && $0.product.buildTriple == .tools
+                $0.product.name == name && $0.buildParameters.destination == .host
             }) {
                 return try builtTool.binaryPath
             } else {

Sources/Commands/Utilities/PluginDelegate.swift

@@ -430,6 +430,7 @@ final class PluginDelegate: PluginInvocationDelegate {
         let result = try symbolGraphExtractor.extractSymbolGraph(
             module: target,
             buildPlan: try buildSystem.buildPlan,
+            buildParameters: buildSystem.buildPlan.toolsBuildParameters,
             outputRedirection: .collect,
             outputDirectory: outputDir,
             verboseOutput: self.swiftCommandState.logLevel <= .info

Sources/Commands/Utilities/SymbolGraphExtract.swift

@@ -56,11 +56,11 @@ public struct SymbolGraphExtract {
     public func extractSymbolGraph(
         module: ResolvedModule,
         buildPlan: BuildPlan,
+        buildParameters: BuildParameters,
         outputRedirection: TSCBasic.Process.OutputRedirection = .none,
         outputDirectory: AbsolutePath,
         verboseOutput: Bool
     ) throws -> ProcessResult {
-        let buildParameters = buildPlan.buildParameters(for: module)
         try self.fileSystem.createDirectory(outputDirectory, recursive: true)
 
         // Construct arguments for extracting symbols for a single target.

Sources/SPMBuildCore/BuildSystem/BuildSystem.swift

@@ -92,28 +92,6 @@ public protocol BuildPlan {
     func createREPLArguments() throws -> [String]
 }
 
-extension BuildPlan {
-    /// Parameters used for building a given target.
-    public func buildParameters(for target: ResolvedModule) -> BuildParameters {
-        switch target.buildTriple {
-        case .tools:
-            return self.toolsBuildParameters
-        case .destination:
-            return self.destinationBuildParameters
-        }
-    }
-
-    /// Parameters used for building a given product.
-    public func buildParameters(for product: ResolvedProduct) -> BuildParameters {
-        switch product.buildTriple {
-        case .tools:
-            return self.toolsBuildParameters
-        case .destination:
-            return self.destinationBuildParameters
-        }
-    }
-}
-
 public protocol BuildSystemFactory {
     func makeBuildSystem(
         explicitProduct: String?,