Merge branch 'main' of github.com:apple/swift-package-manager into revert-7352-maxd/revert-cross-compilation

# Conflicts:
#	Sources/SPMTestSupport/MockPackageGraphs.swift
#	Tests/BuildTests/BuildPlanTests.swift

Author: MaxDesiatov

Sources/Basics/Triple+Basics.swift

@@ -24,6 +24,10 @@ extension Triple {
 }
 
 extension Triple {
+    public var isWasm: Bool {
+        [.wasm32, .wasm64].contains(self.arch)
+    }
+
     public func isApple() -> Bool {
         vendor == .apple
     }
@@ -148,6 +152,10 @@ extension Triple {
     }
 
     public var executableExtension: String {
+        guard !self.isWasm else {
+            return ".wasm"
+        }
+
         guard let os = self.os else {
             return ""
         }
@@ -157,8 +165,6 @@ extension Triple {
             return ""
         case .linux, .openbsd:
             return ""
-        case .wasi:
-            return ".wasm"
         case .win32:
             return ".exe"
         case .noneOS:

Sources/Build/BuildDescription/ClangTargetBuildDescription.swift

@@ -184,7 +184,7 @@ public final class ClangTargetBuildDescription {
         }
     }
 
-    /// An array of tuple containing filename, source, object and dependency path for each of the source in this target.
+    /// An array of tuples containing filename, source, object and dependency path for each of the source in this target.
     public func compilePaths()
         throws -> [(filename: RelativePath, source: AbsolutePath, object: AbsolutePath, deps: AbsolutePath)]
     {

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -12,7 +12,10 @@
 
 import Basics
 import PackageGraph
+
+@_spi(SwiftPMInternal)
 import PackageModel
+
 import OrderedCollections
 import SPMBuildCore
 
@@ -119,15 +122,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
                 return ["-Xlinker", "-dead_strip"]
             } else if triple.isWindows() {
                 return ["-Xlinker", "/OPT:REF"]
-            } else if triple.arch == .wasm32 {
-                // FIXME: wasm-ld strips data segments referenced through __start/__stop symbols
-                // during GC, and it removes Swift metadata sections like swift5_protocols
-                // We should add support of SHF_GNU_RETAIN-like flag for __attribute__((retain))
-                // to LLVM and wasm-ld
-                // This workaround is required for not only WASI but also all WebAssembly triples
-                // using wasm-ld (e.g. wasm32-unknown-unknown). So this branch is conditioned by
-                // arch == .wasm32
-                return []
             } else {
                 return ["-Xlinker", "--gc-sections"]
             }
@@ -198,7 +192,7 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
             // No arguments for static libraries.
             return []
         case .test:
-            // Test products are bundle when using objectiveC, executable when using test entry point.
+            // Test products are bundle when using Objective-C, executable when using test entry point.
             switch self.buildParameters.testingParameters.testProductStyle {
             case .loadableBundle:
                 args += ["-Xlinker", "-bundle"]
@@ -271,8 +265,21 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
         }
         args += ["@\(self.linkFileListPath.pathString)"]
 
-        // Embed the swift stdlib library path inside tests and executables on Darwin.
         if containsSwiftTargets {
+            // Pass experimental features to link jobs in addition to compile jobs. Preserve ordering while eliminating
+            // duplicates with `OrderedSet`.
+            var experimentalFeatures = OrderedSet<String>()
+            for target in self.product.targets {
+                let swiftSettings = target.underlying.buildSettingsDescription.filter { $0.tool == .swift }
+                for case let .enableExperimentalFeature(feature) in swiftSettings.map(\.kind)  {
+                    experimentalFeatures.append(feature)
+                }
+            }
+            for feature in experimentalFeatures {
+                args += ["-enable-experimental-feature", feature]
+            }
+
+            // Embed the swift stdlib library path inside tests and executables on Darwin.
             let useStdlibRpath: Bool
             switch self.product.type {
             case .library(let type):
@@ -297,11 +304,9 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
                     args += ["-Xlinker", "-rpath", "-Xlinker", backDeployedStdlib.pathString]
                 }
             }
-        }
-
-        // Don't link runtime compatibility patch libraries if there are no
-        // Swift sources in the target.
-        if !containsSwiftTargets {
+        } else {
+            // Don't link runtime compatibility patch libraries if there are no
+            // Swift sources in the target.
             args += ["-runtime-compatibility-version", "none"]
         }
 

Sources/PackageLoading/PackageBuilder.swift

@@ -877,7 +877,11 @@ public final class PackageBuilder {
         }
 
         // Create the build setting assignment table for this target.
-        let buildSettings = try self.buildSettings(for: manifestTarget, targetRoot: potentialModule.path, cxxLanguageStandard: self.manifest.cxxLanguageStandard)
+        let buildSettings = try self.buildSettings(
+            for: manifestTarget,
+            targetRoot: potentialModule.path,
+            cxxLanguageStandard: self.manifest.cxxLanguageStandard
+        )
 
         // Compute the path to public headers directory.
         let publicHeaderComponent = manifestTarget.publicHeadersPath ?? ClangTarget.defaultPublicHeadersComponent
@@ -969,6 +973,7 @@ public final class PackageBuilder {
                 packageAccess: potentialModule.packageAccess,
                 swiftVersion: try self.swiftVersion(),
                 buildSettings: buildSettings,
+                buildSettingsDescription: manifestTarget.settings,
                 usesUnsafeFlags: manifestTarget.usesUnsafeFlags
             )
         } else {
@@ -1011,14 +1016,18 @@ public final class PackageBuilder {
                 ignored: ignored,
                 dependencies: dependencies,
                 buildSettings: buildSettings,
+                buildSettingsDescription: manifestTarget.settings,
                 usesUnsafeFlags: manifestTarget.usesUnsafeFlags
             )
         }
     }
 
     /// Creates build setting assignment table for the given target.
-    func buildSettings(for target: TargetDescription?, targetRoot: AbsolutePath, cxxLanguageStandard: String? = nil) throws -> BuildSettings
-        .AssignmentTable
+    func buildSettings(
+        for target: TargetDescription?,
+        targetRoot: AbsolutePath,
+        cxxLanguageStandard: String? = nil
+    ) throws -> BuildSettings.AssignmentTable
     {
         var table = BuildSettings.AssignmentTable()
         guard let target else { return table }
@@ -1653,23 +1662,21 @@ extension PackageBuilder {
                 let sources = Sources(paths: [sourceFile], root: sourceFile.parentDirectory)
                 let buildSettings: BuildSettings.AssignmentTable
 
-                do {
-                    let targetDescription = try TargetDescription(
-                        name: name,
-                        dependencies: dependencies
-                            .map {
-                                TargetDescription.Dependency.target(name: $0.name)
-                            },
-                        path: sourceFile.parentDirectory.pathString,
-                        sources: [sourceFile.pathString],
-                        type: .executable,
-                        packageAccess: false
-                    )
-                    buildSettings = try self.buildSettings(
-                        for: targetDescription,
-                        targetRoot: sourceFile.parentDirectory
-                    )
-                }
+                let targetDescription = try TargetDescription(
+                    name: name,
+                    dependencies: dependencies
+                        .map {
+                            TargetDescription.Dependency.target(name: $0.name)
+                        },
+                    path: sourceFile.parentDirectory.pathString,
+                    sources: [sourceFile.pathString],
+                    type: .executable,
+                    packageAccess: false
+                )
+                buildSettings = try self.buildSettings(
+                    for: targetDescription,
+                    targetRoot: sourceFile.parentDirectory
+                )
 
                 return SwiftTarget(
                     name: name,
@@ -1680,6 +1687,7 @@ extension PackageBuilder {
                     packageAccess: false,
                     swiftVersion: try swiftVersion(),
                     buildSettings: buildSettings,
+                    buildSettingsDescription: targetDescription.settings,
                     usesUnsafeFlags: false
                 )
             }

Sources/PackageModel/Target/BinaryTarget.swift

@@ -41,6 +41,7 @@ public final class BinaryTarget: Target {
             dependencies: [],
             packageAccess: false,
             buildSettings: .init(),
+            buildSettingsDescription: [],
             pluginUsages: [],
             usesUnsafeFlags: false
         )

Sources/PackageModel/Target/ClangTarget.swift

@@ -53,6 +53,7 @@ public final class ClangTarget: Target {
         others: [AbsolutePath] = [],
         dependencies: [Target.Dependency] = [],
         buildSettings: BuildSettings.AssignmentTable = .init(),
+        buildSettingsDescription: [TargetBuildSettingDescription.Setting] = [],
         usesUnsafeFlags: Bool
     ) throws {
         guard includeDir.isDescendantOfOrEqual(to: sources.root) else {
@@ -76,6 +77,7 @@ public final class ClangTarget: Target {
             dependencies: dependencies,
             packageAccess: false,
             buildSettings: buildSettings,
+            buildSettingsDescription: buildSettingsDescription,
             pluginUsages: [],
             usesUnsafeFlags: usesUnsafeFlags
         )

Sources/PackageModel/Target/PluginTarget.swift

@@ -36,6 +36,7 @@ public final class PluginTarget: Target {
             dependencies: dependencies,
             packageAccess: packageAccess,
             buildSettings: .init(),
+            buildSettingsDescription: [],
             pluginUsages: [],
             usesUnsafeFlags: false
         )

Sources/PackageModel/Target/SwiftTarget.swift

@@ -33,6 +33,7 @@ public final class SwiftTarget: Target {
             dependencies: dependencies,
             packageAccess: packageAccess,
             buildSettings: .init(),
+            buildSettingsDescription: [],
             pluginUsages: [],
             usesUnsafeFlags: false
         )
@@ -54,6 +55,7 @@ public final class SwiftTarget: Target {
         packageAccess: Bool,
         swiftVersion: SwiftLanguageVersion,
         buildSettings: BuildSettings.AssignmentTable = .init(),
+        buildSettingsDescription: [TargetBuildSettingDescription.Setting] = [],
         pluginUsages: [PluginUsage] = [],
         usesUnsafeFlags: Bool
     ) {
@@ -70,6 +72,7 @@ public final class SwiftTarget: Target {
             dependencies: dependencies,
             packageAccess: packageAccess,
             buildSettings: buildSettings,
+            buildSettingsDescription: buildSettingsDescription,
             pluginUsages: pluginUsages,
             usesUnsafeFlags: usesUnsafeFlags
         )
@@ -100,6 +103,7 @@ public final class SwiftTarget: Target {
             dependencies: dependencies,
             packageAccess: packageAccess,
             buildSettings: .init(),
+            buildSettingsDescription: [],
             pluginUsages: [],
             usesUnsafeFlags: false
         )

Sources/PackageModel/Target/SystemLibraryTarget.swift

@@ -43,6 +43,7 @@ public final class SystemLibraryTarget: Target {
             dependencies: [],
             packageAccess: false,
             buildSettings: .init(),
+            buildSettingsDescription: [],
             pluginUsages: [],
             usesUnsafeFlags: false
         )

Sources/PackageModel/Target/Target.swift

@@ -233,6 +233,9 @@ public class Target: PolymorphicCodableProtocol {
     /// The build settings assignments of this target.
     public let buildSettings: BuildSettings.AssignmentTable
 
+    @_spi(SwiftPMInternal)
+    public let buildSettingsDescription: [TargetBuildSettingDescription.Setting]
+
     /// The usages of package plugins by this target.
     public let pluginUsages: [PluginUsage]
 
@@ -251,6 +254,7 @@ public class Target: PolymorphicCodableProtocol {
         dependencies: [Target.Dependency],
         packageAccess: Bool,
         buildSettings: BuildSettings.AssignmentTable,
+        buildSettingsDescription: [TargetBuildSettingDescription.Setting],
         pluginUsages: [PluginUsage],
         usesUnsafeFlags: Bool
     ) {
@@ -266,12 +270,27 @@ public class Target: PolymorphicCodableProtocol {
         self.c99name = self.name.spm_mangledToC99ExtendedIdentifier()
         self.packageAccess = packageAccess
         self.buildSettings = buildSettings
+        self.buildSettingsDescription = buildSettingsDescription
         self.pluginUsages = pluginUsages
         self.usesUnsafeFlags = usesUnsafeFlags
     }
 
     private enum CodingKeys: String, CodingKey {
-        case name, potentialBundleName, defaultLocalization, platforms, type, path, sources, resources, ignored, others, packageAccess, buildSettings, pluginUsages, usesUnsafeFlags
+        case name
+        case potentialBundleName
+        case defaultLocalization
+        case platforms
+        case type
+        case path
+        case sources
+        case resources
+        case ignored
+        case others
+        case packageAccess
+        case buildSettings
+        case buildSettingsDescription
+        case pluginUsages
+        case usesUnsafeFlags
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -289,6 +308,7 @@ public class Target: PolymorphicCodableProtocol {
         try container.encode(others, forKey: .others)
         try container.encode(packageAccess, forKey: .packageAccess)
         try container.encode(buildSettings, forKey: .buildSettings)
+        try container.encode(buildSettingsDescription, forKey: .buildSettingsDescription)
         // FIXME: pluginUsages property is skipped on purpose as it points to
         // the actual target dependency object.
         try container.encode(usesUnsafeFlags, forKey: .usesUnsafeFlags)
@@ -310,6 +330,10 @@ public class Target: PolymorphicCodableProtocol {
         self.c99name = self.name.spm_mangledToC99ExtendedIdentifier()
         self.packageAccess = try container.decode(Bool.self, forKey: .packageAccess)
         self.buildSettings = try container.decode(BuildSettings.AssignmentTable.self, forKey: .buildSettings)
+        self.buildSettingsDescription = try container.decode(
+            [TargetBuildSettingDescription.Setting].self,
+            forKey: .buildSettingsDescription
+        )
         // FIXME: pluginUsages property is skipped on purpose as it points to
         // the actual target dependency object.
         self.pluginUsages = []

Sources/SPMBuildCore/BuildParameters/BuildParameters.swift

@@ -260,7 +260,7 @@ public struct BuildParameters: Encodable {
         case .library(.automatic), .plugin:
             fatalError()
         case .test:
-            guard !self.triple.isWASI() else {
+            guard !self.triple.isWasm else {
                 return try RelativePath(validating: "\(product.name).wasm")
             }
             switch testingParameters.library {