[6.2] Isolation fixes for closures and defer bodies #84250
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
The first bug is that we weren't computing isolation correctly for nested defers. This is an unlikely pattern of code, but it's good to fix. The second bug is that getActorIsolationOfContext was looking through defers, but getActorIsolation itself was not. This was causing defer bodies to be emitted in SILGen without an isolation parameter, which meant that #isolation could not possibly provide the right value. Fixing this involves teaching SILGen that non-async functions can have nonisolated(nonsending) isolation, but that's relatively straightforward. This commit doesn't fix #isolation or adequately test SILGen, but that'll be handled in a follow-up.
closures. The fixes for initializers are just setting the stage for doing this properly: we should be able to just change the isolation computation in Sema and fix up the tests.
implicitly uses the isolation.
|
@swift-ci Please test |
hborla
approved these changes
Sep 12, 2025
optimization yet.
|
@swift-ci Please test |
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.
6.2 version of #84181 and #84206.
Scope: SILGen changes to the emission of
nonisolated(nonsending)functions; a few related fixes todeferbodies; also fixes an adjacent crash-on-request-cycleReviewed by: @ktoso
Risk: Fairly low. Most of the impact is to
nonisolated(nonsending)functions, which are a new feature in Swift 6.2. That fix includes a fix todeferbodies which has revealed a series of related bugs indefer. I believe this PR fully plumbs thedeferbugs, but it's possible that there some problems still lurking.Testing: several new regression tests