[6.2][Concurrency] Fix nonisolated(nonsending) interaction with #isolation #82826
+126
−9
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 please test |
ktoso
added
concurrency
jamieQ
reviewed
Jul 7, 2025
test/Concurrency/Runtime/isolated_macro_in_nonisolated_nonsending_func.swift
Outdated
Show resolved
Hide resolved
test/Concurrency/Runtime/isolated_macro_in_nonisolated_nonsending_func.swift
Show resolved
Hide resolved
ktoso
commented
Jul 7, 2025
test/Concurrency/Runtime/isolated_macro_in_nonisolated_nonsending_func.swift
Outdated
Show resolved
Hide resolved
|
@swift-ci please test |
DougGregor
approved these changes
Jul 7, 2025
slavapestov
reviewed
Jul 8, 2025
Small cleanup from code review; we'd crash either way after this line, so might be better to always ASSERT more nicely.
|
@swift-ci please test |
ktoso
deleted the
pick-wip-correct-isolated-handling-with-caller-isolation
branch
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.
Description: The
#isolationdid not work correctly withnonisolated(nonsending), as that would add an implicit isolated parameter in SIL, yet the macro was only considering the AST parameters. This made it impossible to treatnonisolated(nonsending)as a "true" replacement for passingisolated (any Actor)? = #isolationto methods, because we'd not be able to "carry forward" the#isolationinside method bodies.Scope/Impact: This affects users moving to
nonisolated(nonsending)from passing explicit isolated parameters, and allows them to correctly "stay on" the caller as long as they want.Risk: Low, this only corrects the macro expansion in SIL specifically for
nonisolated(nonsending)methods.Testing: CI testing, added runtime and SIL test.
Reviewed by: @DougGregor
Original PR: #82793
Radar: rdar://155003540