Fix build issues after conflicts resolution

MaxDesiatov · MaxDesiatov · commit 14482e0e7686 · 2024-03-08T12:09:48.000Z
diff --git a/Sources/Build/BuildDescription/ClangTargetBuildDescription.swift b/Sources/Build/BuildDescription/ClangTargetBuildDescription.swift
@@ -19,9 +19,6 @@ import struct SPMBuildCore.BuildParameters
 import struct SPMBuildCore.BuildToolPluginInvocationResult
 import struct SPMBuildCore.PrebuildCommandResult
 
-@_spi(SwiftPMInternal)
-import SPMBuildCore
-
 import enum TSCBasic.ProcessEnv
 
 /// Target description for a Clang target i.e. C language family target.
diff --git a/Sources/Build/BuildDescription/ResolvedTarget+BuildDescription.swift b/Sources/Build/BuildDescription/ResolvedTarget+BuildDescription.swift
@@ -13,11 +13,11 @@
 import struct Basics.AbsolutePath
 import struct PackageGraph.ResolvedTarget
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 extension ResolvedTarget {
     func tempsPath(_ buildParameters: BuildParameters) -> AbsolutePath {
-        buildParameters.buildPath.appending(component: self.c99name + "\(self.buildTriple.suffix).build")
+        let suffix = buildParameters.suffix(triple: self.buildTriple)
+        return buildParameters.buildPath.appending(component: self.c99name + "\(suffix).build")
     }
 }
diff --git a/Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift b/Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift
@@ -111,7 +111,8 @@ package final class SwiftTargetBuildDescription {
     }
 
     var modulesPath: AbsolutePath {
-        return self.defaultBuildParameters.buildPath.appending(component: "Modules\(self.target.buildTriple.suffix)")
+        let suffix = self.defaultBuildParameters.suffix(triple: self.target.buildTriple)
+        return self.defaultBuildParameters.buildPath.appending(component: "Modules\(suffix)")
     }
 
     /// The path to the swiftmodule file after compilation.
@@ -644,7 +645,7 @@ package final class SwiftTargetBuildDescription {
 
         args += self.package.packageNameArgument(
             target: self.target,
-            isPackageNameSupported: self.buildParameters.driverParameters.isPackageAccessModifierSupported
+            isPackageNameSupported: self.defaultBuildParameters.driverParameters.isPackageAccessModifierSupported
         )
         args += try self.macroArguments()
         
@@ -673,7 +674,7 @@ package final class SwiftTargetBuildDescription {
         result.append(
             contentsOf: self.package.packageNameArgument(
                 target: self.target,
-                isPackageNameSupported: self.buildParameters.driverParameters.isPackageAccessModifierSupported
+                isPackageNameSupported: self.defaultBuildParameters.driverParameters.isPackageAccessModifierSupported
             )
         )
         if !scanInvocation {
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift
@@ -93,7 +93,7 @@ extension LLBuildManifestBuilder {
         let additionalInputs = try addBuildToolPlugins(.clang(target))
 
         // Create a phony node to represent the entire target.
-        let targetName = target.target.getLLBuildTargetName(config: target.buildParameters.buildConfig)
+        let targetName = target.target.getLLBuildTargetName(buildParameters: target.buildParameters)
         let output: Node = .virtual(targetName)
 
         self.manifest.addNode(output, toTarget: targetName)
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder+Product.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder+Product.swift
@@ -15,7 +15,7 @@ import struct LLBuildManifest.Node
 
 extension LLBuildManifestBuilder {
     func createProductCommand(_ buildProduct: ProductBuildDescription) throws {
-        let cmdName = try buildProduct.product.getCommandName(config: buildProduct.buildParameters.buildConfig)
+        let cmdName = try buildProduct.product.getCommandName(buildParameters: buildProduct.buildParameters)
 
         // Add dependency on Info.plist generation on Darwin platforms.
         let testInputs: [AbsolutePath]
@@ -34,7 +34,7 @@ extension LLBuildManifestBuilder {
         }
 
         // Create a phony node to represent the entire target.
-        let targetName = try buildProduct.product.getLLBuildTargetName(config: buildProduct.buildParameters.buildConfig)
+        let targetName = try buildProduct.product.getLLBuildTargetName(buildParameters: buildProduct.buildParameters)
         let output: Node = .virtual(targetName)
 
         let finalProductNode: Node
@@ -85,7 +85,7 @@ extension LLBuildManifestBuilder {
                     outputPath: plistPath
                 )
 
-                let cmdName = try buildProduct.product.getCommandName(config: buildProduct.buildParameters.buildConfig)
+                let cmdName = try buildProduct.product.getCommandName(buildParameters: buildProduct.buildParameters)
                 let codeSigningOutput = Node.virtual(targetName + "-CodeSigning")
                 try self.manifest.addShellCmd(
                     name: "\(cmdName)-entitlements",
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift
@@ -378,7 +378,7 @@ extension LLBuildManifestBuilder {
         cmdOutputs: [Node]
     ) throws {
         let isLibrary = target.target.type == .library || target.target.type == .test
-        let cmdName = target.target.getCommandName(config: target.defaultBuildParameters.buildConfig)
+        let cmdName = target.target.getCommandName(buildParameters: target.defaultBuildParameters)
 
         self.manifest.addWriteSourcesFileListCommand(sources: target.sources, sourcesFileListPath: target.sourcesFileListPath)
         self.manifest.addSwiftCmd(
@@ -491,7 +491,7 @@ extension LLBuildManifestBuilder {
 
         // Depend on any required macro product's output.
         try target.requiredMacroProducts.forEach { macro in
-            try inputs.append(.virtual(macro.getLLBuildTargetName(config: target.defaultBuildParameters.buildConfig)))
+            try inputs.append(.virtual(macro.getLLBuildTargetName(buildParameters: target.defaultBuildParameters)))
         }
 
         return inputs + additionalInputs
@@ -500,7 +500,7 @@ extension LLBuildManifestBuilder {
     /// Adds a top-level phony command that builds the entire target.
     private func addTargetCmd(_ target: SwiftTargetBuildDescription, cmdOutputs: [Node]) {
         // Create a phony node to represent the entire target.
-        let targetName = target.target.getLLBuildTargetName(config: target.defaultBuildParameters.buildConfig)
+        let targetName = target.target.getLLBuildTargetName(buildParameters: target.defaultBuildParameters)
         let targetOutput: Node = .virtual(targetName)
 
         self.manifest.addNode(targetOutput, toTarget: targetName)
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder.swift
@@ -14,8 +14,6 @@ import Basics
 import LLBuildManifest
 import PackageGraph
 import PackageModel
-
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 #if USE_IMPL_ONLY_IMPORTS
@@ -319,31 +317,33 @@ extension TargetBuildDescription {
 }
 
 extension ResolvedTarget {
-    package func getCommandName(config: String) -> String {
-        "C." + self.getLLBuildTargetName(config: config)
+    package func getCommandName(buildParameters: BuildParameters) -> String {
+        "C." + self.getLLBuildTargetName(buildParameters: buildParameters)
     }
 
-    public func getLLBuildTargetName(config: String) -> String {
-        "\(self.name)-\(config)\(self.buildTriple.suffix).module"
+    package func getLLBuildTargetName(buildParameters: BuildParameters) -> String {
+        "\(self.name)-\(buildParameters.buildConfig)\(buildParameters.suffix(triple: self.buildTriple)).module"
     }
 
-    public func getLLBuildResourcesCmdName(config: String) -> String {
+    package func getLLBuildResourcesCmdName(config: String) -> String {
         "\(self.name)-\(config).module-resources"
     }
 }
 
 extension ResolvedProduct {
-    public func getLLBuildTargetName(config: String) throws -> String {
-        let potentialExecutableTargetName = "\(name)-\(config)\(self.buildTriple.suffix).exe"
-        let potentialLibraryTargetName = "\(name)-\(config)\(self.buildTriple.suffix).dylib"
+    package func getLLBuildTargetName(buildParameters: BuildParameters) throws -> String {
+        let config = buildParameters.buildConfig
+        let suffix = buildParameters.suffix(triple: self.buildTriple)
+        let potentialExecutableTargetName = "\(name)-\(config)\(suffix).exe"
+        let potentialLibraryTargetName = "\(name)-\(config)\(suffix).dylib"
 
         switch type {
         case .library(.dynamic):
             return potentialLibraryTargetName
         case .test:
-            return "\(name)-\(config)\(self.buildTriple.suffix).test"
+            return "\(name)-\(config)\(suffix).test"
         case .library(.static):
-            return "\(name)-\(config)\(self.buildTriple.suffix).a"
+            return "\(name)-\(config)\(suffix).a"
         case .library(.automatic):
             throw InternalError("automatic library not supported")
         case .executable, .snippet:
@@ -359,8 +359,8 @@ extension ResolvedProduct {
         }
     }
 
-    public func getCommandName(config: String) throws -> String {
-        try "C.\(self.getLLBuildTargetName(config: config))\(self.buildTriple.suffix)"
+    public func getCommandName(buildParameters: BuildParameters) throws -> String {
+        try "C.\(self.getLLBuildTargetName(buildParameters: buildParameters))\(buildParameters.suffix(triple: self.buildTriple))"
     }
 }
 
diff --git a/Sources/Build/BuildOperation.swift b/Sources/Build/BuildOperation.swift
@@ -11,19 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-
-import Build
-
 import LLBuildManifest
-
-@_spi(SwiftPMInternal)
 import PackageGraph
-
 import PackageLoading
 import PackageModel
-
 import SPMBuildCore
-
 import SPMLLBuild
 import Foundation
 
@@ -529,7 +521,7 @@ package final class BuildOperation: PackageStructureDelegate, SPMBuildCore.Build
             let graph = try getPackageGraph()
             if let result = subset.llbuildTargetName(
                 for: graph,
-                config: self.productsBuildParameters.configuration.dirname,
+                buildParameters: self.productsBuildParameters,
                 observabilityScope: self.observabilityScope
             ) {
                 return result
@@ -910,9 +902,11 @@ extension BuildSubset {
     }
 
     /// Returns the name of the llbuild target that corresponds to the build subset.
-    func llbuildTargetName(for graph: ModulesGraph, config: String, observabilityScope: ObservabilityScope)
-        -> String?
-    {
+    func llbuildTargetName(
+        for graph: ModulesGraph,
+        buildParameters: BuildParameters,
+        observabilityScope: ObservabilityScope
+    ) -> String? {
         switch self {
         case .allExcludingTests:
             return LLBuildManifestBuilder.TargetKind.main.targetName
@@ -933,14 +927,14 @@ extension BuildSubset {
                 return LLBuildManifestBuilder.TargetKind.main.targetName
             }
             return observabilityScope.trap {
-                try product.getLLBuildTargetName(config: config)
+                try product.getLLBuildTargetName(buildParameters: buildParameters)
             }
         case .target(let targetName):
             guard let target = graph.allTargets.first(where: { $0.name == targetName }) else {
                 observabilityScope.emit(error: "no target named '\(targetName)'")
                 return nil
             }
-            return target.getLLBuildTargetName(config: config)
+            return target.getLLBuildTargetName(buildParameters: buildParameters)
         }
     }
 }
diff --git a/Sources/Build/BuildPlan/BuildPlan+Test.swift b/Sources/Build/BuildPlan/BuildPlan+Test.swift
@@ -28,7 +28,7 @@ extension BuildPlan {
     static func makeDerivedTestTargets(
         destinationBuildParameters: BuildParameters,
         toolsBuildParameters: BuildParameters,
-        _ graph: PackageGraph,
+        _ graph: ModulesGraph,
         shouldDisableSandbox: Bool,
         _ fileSystem: FileSystem,
         _ observabilityScope: ObservabilityScope
diff --git a/Sources/Commands/PackageCommands/PluginCommand.swift b/Sources/Commands/PackageCommands/PluginCommand.swift
@@ -19,7 +19,6 @@ import SPMBuildCore
 
 import Dispatch
 
-@_spi(SwiftPMInternal)
 import PackageGraph
 
 import PackageModel
@@ -325,7 +324,7 @@ struct PluginCommand: SwiftCommand {
         var buildToolsGraph = packageGraph
         try buildToolsGraph.updateBuildTripleRecursively(.tools)
 
-        let buildParameters = try swiftTool.toolsBuildParameters
+        let buildParameters = try swiftCommandState.toolsBuildParameters
         // Build or bring up-to-date any executable host-side tools on which this plugin depends. Add them and any binary dependencies to the tool-names-to-path map.
         let buildSystem = try swiftCommandState.createBuildSystem(
             explicitBuildSystem: .native,
@@ -339,7 +338,7 @@ struct PluginCommand: SwiftCommand {
 
         let accessibleTools = try plugin.processAccessibleTools(
             packageGraph: buildToolsGraph,
-            fileSystem: swiftTool.fileSystem,
+            fileSystem: swiftCommandState.fileSystem,
             environment: buildParameters.buildEnvironment,
             for: try pluginScriptRunner.hostTriple
         ) { name, _ in
diff --git a/Sources/Commands/Utilities/PluginDelegate.swift b/Sources/Commands/Utilities/PluginDelegate.swift
@@ -239,7 +239,7 @@ final class PluginDelegate: PluginInvocationDelegate {
         let testEnvironment = try TestingSupport.constructTestEnvironment(
             toolchain: toolchain,
             destinationBuildParameters: toolsBuildParameters,
-            sanitizers: swiftTool.options.build.sanitizers
+            sanitizers: swiftCommandState.options.build.sanitizers
         )
 
         // Iterate over the tests and run those that match the filter.
diff --git a/Sources/PackageGraph/ModulesGraph.swift b/Sources/PackageGraph/ModulesGraph.swift
@@ -213,8 +213,7 @@ public struct ModulesGraph {
         self.allProducts = allProducts
     }
 
-    @_spi(SwiftPMInternal)
-    public mutating func updateBuildTripleRecursively(_ buildTriple: BuildTriple) throws {
+    package mutating func updateBuildTripleRecursively(_ buildTriple: BuildTriple) throws {
         self.reachableTargets = IdentifiableSet(self.reachableTargets.map {
             var target = $0
             target.buildTriple = buildTriple
diff --git a/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift b/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift
@@ -248,7 +248,7 @@ public struct BuildParameters: Encodable {
 
     /// Returns the path to the binary of a product for the current build parameters, relative to the build directory.
     public func binaryRelativePath(for product: ResolvedProduct) throws -> RelativePath {
-        let potentialExecutablePath = try RelativePath(validating: "\(product.name)\(product.buildTriple.suffix)\(self.triple.executableExtension)")
+        let potentialExecutablePath = try RelativePath(validating: "\(product.name)\(self.suffix(triple: product.buildTriple))\(self.triple.executableExtension)")
 
         switch product.type {
         case .executable, .snippet:
@@ -330,11 +330,10 @@ extension Triple {
     }
 }
 
-extension BuildTriple {
+extension BuildParameters {
     /// Suffix appended to build manifest nodes to distinguish nodes created for tools from nodes created for
     /// end products, i.e. nodes for host vs target triples.
-    @_spi(SwiftPMInternal)
-    public var suffix: String {
-        if self == .tools { "-tool" } else { "" }
+    package func suffix(triple: BuildTriple) -> String {
+        if triple == .tools { "-tool" } else { "" }
     }
 }
diff --git a/Sources/SPMTestSupport/MockBuildTestHelper.swift b/Sources/SPMTestSupport/MockBuildTestHelper.swift
@@ -73,7 +73,7 @@ package let defaultTargetTriple: String = hostTriple.tripleString(forPlatformVer
 package let defaultTargetTriple: String = hostTriple.tripleString
 #endif
 
-public func mockBuildParameters(
+package func mockBuildParameters(
     buildPath: AbsolutePath? = nil,
     config: BuildConfiguration = .debug,
     toolchain: PackageModel.Toolchain = MockToolchain(),
diff --git a/Tests/BuildTests/CrossCompilationBuildPlanTests.swift b/Tests/BuildTests/CrossCompilationBuildPlanTests.swift
diff --git a/Tests/BuildTests/CrossCompilationBuildTests.swift b/Tests/BuildTests/CrossCompilationBuildTests.swift
diff --git a/Tests/BuildTests/ProductBuildDescriptionTests.swift b/Tests/BuildTests/ProductBuildDescriptionTests.swift

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`import struct Basics.AbsolutePath`
`14`	`14`	`import struct PackageGraph.ResolvedTarget`
`15`	`15`
`16`		`-@_spi(SwiftPMInternal)`
`17`	`16`	`import SPMBuildCore`
`18`	`17`
`19`	`18`	`extension ResolvedTarget {`
`20`	`19`	`func tempsPath(_ buildParameters: BuildParameters) -> AbsolutePath {`
`21`		`- buildParameters.buildPath.appending(component: self.c99name + "\(self.buildTriple.suffix).build")`
	`20`	`+ let suffix = buildParameters.suffix(triple: self.buildTriple)`
	`21`	`+ return buildParameters.buildPath.appending(component: self.c99name + "\(suffix).build")`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ package final class SwiftTargetBuildDescription {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`var modulesPath: AbsolutePath {`
`114`		`- return self.defaultBuildParameters.buildPath.appending(component: "Modules\(self.target.buildTriple.suffix)")`
	`114`	`+ let suffix = self.defaultBuildParameters.suffix(triple: self.target.buildTriple)`
	`115`	`+ return self.defaultBuildParameters.buildPath.appending(component: "Modules\(suffix)")`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`/// The path to the swiftmodule file after compilation.`
`@@ -644,7 +645,7 @@ package final class SwiftTargetBuildDescription {`
`644`	`645`
`645`	`646`	`args += self.package.packageNameArgument(`
`646`	`647`	`target: self.target,`
`647`		`- isPackageNameSupported: self.buildParameters.driverParameters.isPackageAccessModifierSupported`
	`648`	`+ isPackageNameSupported: self.defaultBuildParameters.driverParameters.isPackageAccessModifierSupported`
`648`	`649`	`)`
`649`	`650`	`args += try self.macroArguments()`
`650`	`651`
`@@ -673,7 +674,7 @@ package final class SwiftTargetBuildDescription {`
`673`	`674`	`result.append(`
`674`	`675`	`contentsOf: self.package.packageNameArgument(`
`675`	`676`	`target: self.target,`
`676`		`- isPackageNameSupported: self.buildParameters.driverParameters.isPackageAccessModifierSupported`
	`677`	`+ isPackageNameSupported: self.defaultBuildParameters.driverParameters.isPackageAccessModifierSupported`
`677`	`678`	`)`
`678`	`679`	`)`
`679`	`680`	`if !scanInvocation {`