Periodic merge main -> release 6.2

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,4 +2,4 @@ _[Put a one line description of your change into the PR title, please be specifi
 
 _[Explain the context, and why you're making that change. What is the problem you're trying to solve.]_
 
-_[Tests can be run by commenting `@swift-ci` test on the pull request, for more information see [this](https://github.com/swiftlang/swift-build/blob/main/README.md)]_
+_[Tests can be run by commenting `@swift-ci test` on the pull request, for more information see [this](https://github.com/swiftlang/swift-build/blob/main/README.md)]_

Package.swift

@@ -31,16 +31,20 @@ func swiftSettings(languageMode: SwiftLanguageMode) -> [SwiftSetting] {
             .enableUpcomingFeature("ConciseMagicFile"),
             .enableUpcomingFeature("DeprecateApplicationMain"),
             .enableUpcomingFeature("DisableOutwardActorInference"),
+            //.enableUpcomingFeature("DynamicActorIsolation"),
             .enableUpcomingFeature("ForwardTrailingClosures"),
+            .enableUpcomingFeature("GlobalActorIsolatedTypesUsability"),
             .enableUpcomingFeature("GlobalConcurrency"),
             .enableUpcomingFeature("ImplicitOpenExistentials"),
             .enableUpcomingFeature("ImportObjcForwardDeclarations"),
             .enableUpcomingFeature("InferSendableFromCaptures"),
             .enableUpcomingFeature("IsolatedDefaultValues"),
+            .enableUpcomingFeature("NonfrozenEnumExhaustivity"),
             //.enableUpcomingFeature("RegionBasedIsolation"), // rdar://137809703
 
             // Future Swift features
             .enableUpcomingFeature("ExistentialAny"),
+            .enableUpcomingFeature("MemberImportVisibility"),
             .enableUpcomingFeature("InternalImportsByDefault"),
 
             .swiftLanguageMode(.v5),
@@ -51,6 +55,7 @@ func swiftSettings(languageMode: SwiftLanguageMode) -> [SwiftSetting] {
         return [
             // Future Swift features
             .enableUpcomingFeature("ExistentialAny"),
+            .enableUpcomingFeature("MemberImportVisibility"),
             .enableUpcomingFeature("InternalImportsByDefault"),
 
             .swiftLanguageMode(.v6),
@@ -195,7 +200,6 @@ let package = Package(
                 "SWBCSupport",
                 "SWBLibc",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "Crypto", package: "swift-crypto", condition: .when(platforms: [.linux, .openbsd, .android])),
                 .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .android, .windows])),
             ],
             exclude: ["CMakeLists.txt"],
@@ -232,7 +236,14 @@ let package = Package(
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBUniversalPlatform",
-            dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
+            dependencies: [
+                "SWBCore",
+                "SWBMacro",
+                "SWBUtil",
+                "SWBTaskConstruction",
+                "SWBTaskExecution",
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
@@ -427,7 +438,6 @@ for target in package.targets {
 // `SWIFTCI_USE_LOCAL_DEPS` configures if dependencies are locally available to build
 if useLocalDependencies {
     package.dependencies += [
-        .package(path: "../swift-crypto"),
         .package(path: "../swift-driver"),
         .package(path: "../swift-system"),
         .package(path: "../swift-argument-parser"),
@@ -437,7 +447,6 @@ if useLocalDependencies {
     }
 } else {
     package.dependencies += [
-        .package(url: "https://github.com/apple/swift-crypto.git", "2.0.0"..<"4.0.0"),
         .package(url: "https://github.com/swiftlang/swift-driver.git", branch: "release/6.2"),
         .package(url: "https://github.com/apple/swift-system.git", .upToNextMajor(from: "1.4.1")),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.3"),

Plugins/cmake-smoke-test/cmake-smoke-test.swift

@@ -41,12 +41,6 @@ struct CMakeSmokeTest: CommandPlugin {
         let swiftSystemURL = try findSiblingRepository("swift-system", swiftBuildURL: swiftBuildURL)
         let swiftSystemBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-system")
 
-        let swiftAsn1URL = try findSiblingRepository("swift-asn1", swiftBuildURL: swiftBuildURL)
-        let swiftAsn1BuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-asn1")
-
-        let swiftCryptoURL = try findSiblingRepository("swift-crypto", swiftBuildURL: swiftBuildURL)
-        let swiftCryptoBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-crypto")
-
         let llbuildURL = try findSiblingRepository("llbuild", swiftBuildURL: swiftBuildURL)
         let llbuildBuildURL = context.pluginWorkDirectoryURL.appending(component: "llbuild")
 
@@ -56,7 +50,7 @@ struct CMakeSmokeTest: CommandPlugin {
         let swiftDriverURL = try findSiblingRepository("swift-driver", swiftBuildURL: swiftBuildURL)
         let swiftDriverBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-driver")
 
-        for url in [swiftToolsSupportCoreBuildURL, swiftAsn1BuildURL, swiftCryptoBuildURL, swiftSystemBuildURL, llbuildBuildURL, swiftArgumentParserBuildURL, swiftDriverBuildURL, swiftBuildBuildURL] {
+        for url in [swiftToolsSupportCoreBuildURL, swiftSystemBuildURL, llbuildBuildURL, swiftArgumentParserBuildURL, swiftDriverBuildURL, swiftBuildBuildURL] {
             try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
         }
 
@@ -69,8 +63,6 @@ struct CMakeSmokeTest: CommandPlugin {
             "-DArgumentParser_DIR=\(swiftArgumentParserBuildURL.appending(components: "cmake", "modules").path())",
             "-DLLBuild_DIR=\(llbuildBuildURL.appending(components: "cmake", "modules").path())",
             "-DTSC_DIR=\(swiftToolsSupportCoreBuildURL.appending(components: "cmake", "modules").path())",
-            "-DSwiftASN1_DIR=\(swiftAsn1BuildURL.appending(components: "cmake", "modules").path())",
-            "-DSwiftCrypto_DIR=\(swiftCryptoBuildURL.appending(components: "cmake", "modules").path())",
             "-DSwiftDriver_DIR=\(swiftDriverBuildURL.appending(components: "cmake", "modules").path())",
             "-DSwiftSystem_DIR=\(swiftSystemBuildURL.appending(components: "cmake", "modules").path())"
         ]
@@ -87,18 +79,6 @@ struct CMakeSmokeTest: CommandPlugin {
         try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftToolsSupportCoreBuildURL)
         print("Built swift-tools-support-core")
 
-        if hostOS != .macOS && hostOS != .windows {
-            print("Building swift-asn1")
-            try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftAsn1URL.path()], workingDirectory: swiftAsn1BuildURL)
-            try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftAsn1BuildURL)
-            print("Built swift-asn1")
-
-            print("Building swift-crypto")
-            try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftCryptoURL.path()], workingDirectory: swiftCryptoBuildURL)
-            try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftCryptoBuildURL)
-            print("Built swift-crypto")
-        }
-
         if hostOS != .macOS {
             print("Building swift-system")
             try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftSystemURL.path()], workingDirectory: swiftSystemBuildURL)

Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift

@@ -12,6 +12,7 @@
 
 public import SWBCore
 import SWBUtil
+import Foundation
 
 /// A grouping strategy that groups all asset catalogs and all strings files that match sticker packs inside those asset catalogs.
 @_spi(Testing) public final class ActoolInputFileGroupingStrategy: InputFileGroupingStrategy {

Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift

@@ -13,6 +13,7 @@
 import SWBCore
 import SWBUtil
 import SWBTaskConstruction
+import SWBMacro
 
 final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
 

Sources/SWBApplePlatform/CoreDataCompiler.swift

@@ -12,6 +12,7 @@
 
 import SWBUtil
 public import SWBCore
+import SWBMacro
 
 public final class CoreDataModelCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.model.coredata"

Sources/SWBApplePlatform/CoreMLCompiler.swift

@@ -13,6 +13,7 @@
 public import SWBUtil
 public import SWBCore
 public import SWBMacro
+import SWBProtocol
 
 public struct DiscoveredCoreMLToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
     public let toolPath: Path
@@ -151,7 +152,7 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         // When the build setting is empty or is set to Automatic, then use an appropriate string based on the predominant source code language for the target.
         if languageSettingValue.isEmpty || languageSettingValue == "Automatic" {
             // Note that it would be pretty weird here to not have a configured target, or to have a target which is not a StandardTarget.
-            let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
+            let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? SWBCore.StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
             switch predominantSourceCodeLanguage {
             case .swift:
                 codegenLanguage = "Swift"
@@ -289,7 +290,7 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
                 }
 
                 guard
-                    let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
+                    let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
                     let outputPath = headerOutputPath,
                     target.headersBuildPhase != nil else { continue }
 

Sources/SWBApplePlatform/DevelopmentAssetsTaskProducer.swift

@@ -13,6 +13,7 @@
 import SWBCore
 import SWBUtil
 import SWBTaskConstruction
+import SWBMacro
 
 final class DevelopmentAssetsTaskProducer: StandardTaskProducer, TaskProducer {
     func generateTasks() async -> [any PlannedTask] {

Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift

@@ -12,6 +12,7 @@
 
 import SWBUtil
 public import SWBCore
+import SWBMacro
 
 public final class InstrumentsPackageBuilderSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.instruments-package-builder"

Sources/SWBApplePlatform/IntentsCompiler.swift

@@ -12,6 +12,8 @@
 
 import SWBUtil
 public import SWBCore
+import SWBProtocol
+import SWBMacro
 
 /// Payload information for Intents tasks.
 fileprivate struct IntentsTaskPayload: TaskPayload, Encodable {
@@ -122,7 +124,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
         let outputDir = cbc.scope.evaluate(BuiltinMacros.DERIVED_FILE_DIR).join("IntentDefinitionGenerated").join(modelName).normalize()
 
         guard
-            let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
+            let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
             target.sourcesBuildPhase != nil,
             let intentsCodegenVisibility = input.intentsCodegenVisibility else { return }
 
@@ -136,7 +138,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
         // When the build setting is empty or is set to Automatic, then use an appropriate string based on the predominant source code language for the target.
         if languageSettingValue.isEmpty || languageSettingValue == "Automatic" {
             // Note that it would be pretty weird here to not have a configured target, or to have a target which is not a StandardTarget.
-            let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
+            let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? SWBCore.StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
             switch predominantSourceCodeLanguage {
             case .swift:
                 codegenLanguage = "Swift"
@@ -236,7 +238,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
                 }
 
                 guard
-                    let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
+                    let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
                     let outputPath = headerOutputPath,
                     target.headersBuildPhase != nil else { continue }
 

Sources/SWBApplePlatform/MiGCompiler.swift

@@ -13,6 +13,7 @@
 public import SWBUtil
 public import SWBCore
 public import SWBMacro
+import SWBProtocol
 
 public struct DiscoveredMiGToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
     public let toolPath: Path

Sources/SWBApplePlatform/Plugin.swift

@@ -18,6 +18,7 @@ import Foundation
 import SWBTaskConstruction
 
 @PluginExtensionSystemActor public func initializePlugin(_ manager: PluginManager) {
+    manager.register(AppleDeveloperDirectoryExtension(), type: DeveloperDirectoryExtensionPoint.self)
     manager.register(ApplePlatformSpecsExtension(), type: SpecificationsExtensionPoint.self)
     manager.register(ActoolInputFileGroupingStrategyExtension(), type: InputFileGroupingStrategyExtensionPoint.self)
     manager.register(ImageScaleFactorsInputFileGroupingStrategyExtension(), type: InputFileGroupingStrategyExtensionPoint.self)
@@ -29,6 +30,12 @@ import SWBTaskConstruction
     manager.register(AppleSettingsBuilderExtension(), type: SettingsBuilderExtensionPoint.self)
 }
 
+struct AppleDeveloperDirectoryExtension: DeveloperDirectoryExtension {
+    func fallbackDeveloperDirectory(hostOperatingSystem: OperatingSystem) async throws -> Path? {
+        try await hostOperatingSystem == .macOS ? Xcode.getActiveDeveloperDirectoryPath() : nil
+    }
+}
+
 struct TaskProducersExtension: TaskProducerExtension {
 
     func createPreSetupTaskProducers(_ context: TaskProducerContext) -> [any TaskProducer] {
@@ -148,6 +155,10 @@ struct ActoolInputFileGroupingStrategyExtension: InputFileGroupingStrategyExtens
         }
         return ["actool": Factory()]
     }
+
+    func fileTypesCompilingToSwiftSources() -> [String] {
+        return ["folder.abstractassetcatalog"]
+    }
 }
 
 struct ImageScaleFactorsInputFileGroupingStrategyExtension: InputFileGroupingStrategyExtension {
@@ -159,6 +170,10 @@ struct ImageScaleFactorsInputFileGroupingStrategyExtension: InputFileGroupingStr
         }
         return ["image-scale-factors": Factory()]
     }
+
+    func fileTypesCompilingToSwiftSources() -> [String] {
+        return []
+    }
 }
 
 struct LocalizationInputFileGroupingStrategyExtension: InputFileGroupingStrategyExtension {
@@ -170,6 +185,10 @@ struct LocalizationInputFileGroupingStrategyExtension: InputFileGroupingStrategy
         }
         return ["region": Factory()]
     }
+
+    func fileTypesCompilingToSwiftSources() -> [String] {
+        return []
+    }
 }
 
 struct XCStringsInputFileGroupingStrategyExtension: InputFileGroupingStrategyExtension {
@@ -181,6 +200,10 @@ struct XCStringsInputFileGroupingStrategyExtension: InputFileGroupingStrategyExt
         }
         return ["xcstrings": Factory()]
     }
+
+    func fileTypesCompilingToSwiftSources() -> [String] {
+        return []
+    }
 }
 
 struct ApplePlatformInfoExtension: PlatformInfoExtension {

Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift

@@ -13,6 +13,7 @@
 import Foundation
 package import SWBCore
 import SWBUtil
+import SWBMacro
 
 //---------------------
 //

Sources/SWBApplePlatform/ResMergerLinkerSpec.swift

@@ -12,6 +12,7 @@
 
 import SWBUtil
 public import SWBCore
+import SWBMacro
 
 public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.pbx.linkers.resmerger"

Sources/SWBApplePlatform/Specs/Darwin Package Types.xcspec

@@ -58,7 +58,6 @@
         Description = "OCUnit Test Bundle";
         DefaultBuildSettings = {
             WRAPPER_SUFFIX = "octest";
-            ENABLE_BITCODE = NO;
         };
         ProductReference = {
             FileType = wrapper.cfbundle;

Sources/SWBApplePlatform/Specs/Darwin Product Types.xcspec

@@ -155,7 +155,6 @@
         Description = "OCUnit Test Bundle";
         DefaultBuildProperties = {
             WRAPPER_EXTENSION = "octest";
-            ENABLE_BITCODE = NO;
             ENTITLEMENTS_REQUIRED = NO;
         };
         PackageTypes = (

Sources/SWBApplePlatform/Specs/Embedded-Shared.xcspec

@@ -28,11 +28,6 @@
         Identifier = com.apple.build-system.native;
         BasedOn = "default:com.apple.build-system.native";
         Properties = (
-            {
-                Name = "ENABLE_BITCODE";
-                Type = Boolean;
-                DefaultValue = NO;
-            },
         );
     },
 )

Sources/SWBApplePlatform/Specs/watchOS Shared.xcspec

@@ -117,50 +117,6 @@
         BasedOn = "com.apple.product-type.app-extension";
     },
 
-    // --- LLVM Compiler
-    {
-        _Domain = watchos-shared;
-        Type = Compiler;
-        Identifier = "com.apple.compilers.llvm.clang.1_0.compiler";
-        BasedOn = "default:com.apple.compilers.llvm.clang.1_0.compiler";
-        InputFileTypes = (
-            "sourcecode.c.c",
-            "sourcecode.c.objc",
-            "sourcecode.cpp.cpp",
-            "sourcecode.cpp.objcpp",
-            {
-                "FileType" = "sourcecode.asm";
-                "Condition" = "! $(ENABLE_BITCODE)";
-                "ErrorMessage" = "$(InputFileName): Assembly files are not supported for the $(PLATFORM_DISPLAY_NAME) platform (arch $(CURRENT_ARCH)).";
-            },
-        );
-        Options = (
-            // Generate bitcode options - not visible in the build settings.
-            {
-                Name = "CLANG_BITCODE_GENERATION_MODE";
-                Type = Enumeration;
-                Values = (
-                    none,
-                    marker,
-                    bitcode,
-                );
-                DefaultValue = "$(BITCODE_GENERATION_MODE)";
-                Condition = "$(ENABLE_BITCODE)";
-                CommandLineArgs = {
-                    none = ();
-                    marker = (
-                        "-fembed-bitcode-marker",
-                        "-fno-gnu-inline-asm",
-                    );
-                    bitcode = (
-                        "-fembed-bitcode",
-                        "-fno-gnu-inline-asm",
-                    );
-                };
-            },
-        );
-    },
-
     // Actool ATV specific bits
     {
         _Domain = watchos-shared;