Fix main executor check in startOnMainActor
#65271
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
startOnMainActor checked the current executor directly, which in some cases came back as a `nullptr`. This happens with older API which don't know to set the current executor. `swift_task_isCurrentExecutor` knows how to check for the current dispatch queue and the main thread though, so switching the main-executor check to use that API instead.
Adding discardableResult to startOnMainActor
|
@swift-ci please test |
DougGregor
approved these changes
Apr 18, 2023
etcwilde
added
the
concurrency
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the main executor check in
swift_task_startOnMainActorImpl.Some API's don't set the current executor. In that case, the current executor is a nullptr and the direct check fails.
Using
swift_task_isCurrentExecutorchecks that we're actually on the main executor in those cases by checking the current dispatch queue identity, and checking that we're on the main thread.Also adding
@discardableResultsince we can discard the results from this SPI.rdar://108221645
rdar://108222007