Merge remote-tracking branch 'origin/main' into release/5.10

Author: swift-ci

Sources/CoreCommands/Options.swift

@@ -477,11 +477,8 @@ public struct BuildOptions: ParsableArguments {
     )
     public var linkTimeOptimizationMode: LinkTimeOptimizationMode?
 
-    @Flag(help: .hidden)
-    public var enableGetTaskAllowEntitlement: Bool = false
-
-    @Flag(help: .hidden)
-    public var disableGetTaskAllowEntitlement: Bool = false
+    @Flag(inversion: .prefixedEnableDisable, help: .hidden)
+    public var getTaskAllowEntitlement: Bool? = nil
 
     // @Flag works best when there is a default value present
     // if true, false aren't enough and a third state is needed

Sources/CoreCommands/SwiftTool.swift

@@ -682,9 +682,7 @@ public final class SwiftTool {
             component: targetTriple.platformBuildPathComponent(buildSystem: options.build.buildSystem)
         )
 
-        if !targetTriple.isMacOSX && (
-            options.build.disableGetTaskAllowEntitlement || options.build.enableGetTaskAllowEntitlement
-        ) {
+        if options.build.getTaskAllowEntitlement != nil && !targetTriple.isMacOSX {
             observabilityScope.emit(warning: Self.entitlementsMacOSWarning)
         }
 
@@ -705,8 +703,7 @@ public final class SwiftTool {
                 debugInfoFormat: options.build.debugInfoFormat.buildParameter,
                 targetTriple: targetTriple,
                 shouldEnableDebuggingEntitlement:
-                    (options.build.configuration == .debug && !options.build.disableGetTaskAllowEntitlement) ||
-                    (options.build.enableGetTaskAllowEntitlement && !options.build.disableGetTaskAllowEntitlement)
+                    options.build.getTaskAllowEntitlement ?? (options.build.configuration == .debug)
             ),
             driverParameters: .init(
                 canRenameEntrypointFunctionName: driverSupport.checkSupportedFrontendFlags(

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -5017,7 +5017,7 @@ final class WorkspaceTests: XCTestCase {
         do {
             let ws = try workspace.getOrCreateWorkspace()
             let pinsStore = try ws.pinsStore.load()
-            let fooPin = pinsStore.pins.values.first(where: { $0.packageRef.identity.description == "foo" })!
+            let fooPin = try XCTUnwrap(pinsStore.pins.values.first(where: { $0.packageRef.identity.description == "foo" }))
 
             let fooRepo = workspace.repositoryProvider
                 .specifierMap[RepositorySpecifier(path: try AbsolutePath(