Sema: Disambiguate some more bidirectional conversions #85933
Merged
+175
−71
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
xedin
approved these changes
Dec 9, 2025
This fixes an ambiguity introduced by the stdlib change in 0f99458. Since (borrowing T) -> () and (T) -> () both convert to each other, we could end up with ambiguous solutions where neither one was better than the other. Generalize the existing trick we use for labeled vs unlabeled tuples to also strip off ownership specifiers and @convention(...) from function types. This fixes the regression, as well an existing FIXME in a test I added a while ago where the same problem arises with @convention(block).
slavapestov
force-pushed
the
fix-ben-regression
branch
from
45c71de to
f3e6b4c
Compare
Contributor
Author
|
@swift-ci Please smoke test |
Contributor
Author
|
@swift-ci Please test source compatibility |
Contributor
Author
|
@swift-ci Please test macOS |
Contributor
Author
|
@swift-ci Please smoke test macOS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This fixes an ambiguity introduced by the stdlib change in 0f99458.
Since
(borrowing T) -> ()and(T) -> ()both convert to each other, we could end up with ambiguous solutions where neither one was better than the other. Generalize the existing trick we use for labeled vs unlabeled tuples to also strip off ownership specifiers and@convention(...)from function types. This fixes the regression, as well an existing FIXME in a test I added a while ago where the same problem arises with@convention(block).