Merge pull request #80006 from DougGregor/concurrency-if-task-to-thread

DougGregor · web-flow · commit 1fafebccdfac · 2025-03-13T21:39:04.000-07:00
[Concurrency] Remove unnecessary #ifs that break task-to-thread model
diff --git a/stdlib/public/Concurrency/Task.swift b/stdlib/public/Concurrency/Task.swift
@@ -1539,8 +1539,6 @@ func _taskCreateNullaryContinuationJob(priority: Int, continuation: Builtin.RawU
 @_silgen_name("swift_task_isCurrentExecutor")
 func _taskIsCurrentExecutor(_ executor: Builtin.Executor) -> Bool
 
-#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY && !SWIFT_CONCURRENCY_EMBEDDED
-
 @available(SwiftStdlib 6.2, *)
 @_silgen_name("swift_task_isCurrentExecutorWithFlags")
 @usableFromInline
@@ -1555,7 +1553,6 @@ extension GlobalActor {
     return unsafe _taskIsCurrentExecutor(executor: executor.executor, flags: 0)
   }
 }
-#endif
 
 @available(SwiftStdlib 5.1, *)
 @usableFromInline

Original file line number	Diff line number	Diff line change
`@@ -1539,8 +1539,6 @@ func _taskCreateNullaryContinuationJob(priority: Int, continuation: Builtin.RawU`
`1539`	`1539`	`@_silgen_name("swift_task_isCurrentExecutor")`
`1540`	`1540`	`func _taskIsCurrentExecutor(_ executor: Builtin.Executor) -> Bool`
`1541`	`1541`
`1542`		`-#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY && !SWIFT_CONCURRENCY_EMBEDDED`
`1543`		`-`
`1544`	`1542`	`@available(SwiftStdlib 6.2, *)`
`1545`	`1543`	`@_silgen_name("swift_task_isCurrentExecutorWithFlags")`
`1546`	`1544`	`@usableFromInline`
`@@ -1555,7 +1553,6 @@ extension GlobalActor {`
`1555`	`1553`	`return unsafe _taskIsCurrentExecutor(executor: executor.executor, flags: 0)`
`1556`	`1554`	`}`
`1557`	`1555`	`}`
`1558`		`-#endif`
`1559`	`1556`
`1560`	`1557`	`@available(SwiftStdlib 5.1, *)`
`1561`	`1558`	`@usableFromInline`