[6.1] Fix some type issues around handling closures in SendNonSendable #79164
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
|
@swift-ci test |
… into a SILFunction's context to actually do so. I did this by adding a SILIsolationInfo::isNonSendableType API that takes CanTypes and use it to avoid needing to lower certain CanTypes before performing the query. I also made sure to use the partial apply callee function to map the type into context, so we perform all of the correct substitutions. rdar://138667211
gottesmm
force-pushed
the
release/6.1-rdar138667211
branch
from
ff3e421 to
538823a
Compare
|
@swift-ci test |
|
@swift-ci test windows platform |
xedin
approved these changes
Feb 10, 2025
DougGregor
approved these changes
Feb 10, 2025
|
@swift-ci test windows platform |
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.
This change fixes a logic error where we were not correctly checking if a type was non-Sendable by converting a potentially not lowered type from the AST to a SILType and then checking non-Sendability with that. Since the type was not lowered in cases where the formal and lowered type of a capture differed, we crashed. Instead, we now perform the check at the CanType level with formal types.
On main, I have completely eliminated this code path by just using a SIL level check (since it also fixed another unrelated issue). This was viewed as too risky for 6.1 (#78990), so I went back in and redid it just using types.
Risk: Low
Testing: Added compiler tests.
Issue: rdar://142661388
Reviewer: @xedin
Original PRs: N/A