Skip to content

Conversation

@xedin
Copy link
Contributor

@xedin xedin commented Apr 5, 2024

Cherry-pick of #72868


  • Explanation:

This approach for ambiguity resolution regressed existing ternary expressions
that join to any Sendable and one branch is inferred from the ternary type variable.

The test-cases introduced by the original PR I left in place with error messages and
TODOs to figure out a way to resolve ambiguity.

xedin added 3 commits April 5, 2024 10:44
…dable subtyping"

This reverts commit 359ea14.

(cherry picked from commit cd472fe)
…gnize @sendable subtyping"

Reverts code chagnes introduced by 5626881 but leaves (modified) test-cases

This approach regressed existing ternary expressions that join to `any Sendable`
and one branch is inferred from the ternary type variable.

(cherry picked from commit 0a49d28)
@xedin xedin added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.0 labels Apr 5, 2024
@xedin xedin requested a review from a team as a code owner April 5, 2024 17:47
@xedin
Copy link
Contributor Author

xedin commented Apr 5, 2024

@swift-ci please test

@xedin xedin requested a review from hborla April 5, 2024 17:47
@xedin xedin merged commit 3cb184a into swiftlang:release/6.0 Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🍒 release cherry pick Flag: Release branch cherry picks swift 6.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants