Skip to content

Conversation

@ktoso
Copy link
Contributor

@ktoso ktoso commented Jul 3, 2024

@ktoso ktoso requested a review from a team as a code owner July 3, 2024 16:07
@ktoso
Copy link
Contributor Author

ktoso commented Jul 3, 2024

@swift-ci please test

@ktoso ktoso requested review from DougGregor and tshortli July 3, 2024 16:07
@ktoso ktoso changed the title Prevent potential for condfail with owned task executor parameter [6.0] Prevent potential for condfail with owned task executor parameter Jul 3, 2024
@tshortli tshortli force-pushed the pick-avoid-condfail-with-owned-taskgroup branch 2 times, most recently from 954f934 to d07f8a5 Compare July 3, 2024 18:19
ktoso and others added 3 commits July 3, 2024 11:22
While the new parameter is added in a compatible way where code which
does not refer to it will get a defaulted nil value; since we refer to a
new parameter name in source, we need to guard it with a language
feature -- as old compilers will not have this new name available.

This should prevent a potential condfail issue.
Supported older compilers don't enable this feature by default, so it can't be
omitted from the `_Concurrency` module's flags (regression from
swiftlang#74543).

Additionally, remove `@_allowFeatureSuppression(IsolatedAny)` from all
declarations. We no longer need to support compilers that don't have the
`IsolatedAny` feature, so the suppression is superfluous and the alternative
branches didn't actually build anyways. _Additionally_, the suppressible
feature logic could not handle suppressing `IsolatedAny` simultaneously with
`SendingArgsAndResults`, resulting in a broken interface because `sending` was
used outside `#if $SendingArgsAndResults` guards.
@tshortli tshortli force-pushed the pick-avoid-condfail-with-owned-taskgroup branch from d07f8a5 to d357be9 Compare July 3, 2024 18:22
@tshortli
Copy link
Contributor

tshortli commented Jul 3, 2024

@swift-ci please test

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you

@tshortli tshortli enabled auto-merge July 3, 2024 18:41
@tshortli tshortli merged commit 3107100 into swiftlang:release/6.0 Jul 4, 2024
@ktoso ktoso deleted the pick-avoid-condfail-with-owned-taskgroup branch July 5, 2024 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants