[Constraint solver] Track "isolated by preconcurrency" in the solver. #59963
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
Rather than re-using `DiagnosticBehavior` to describe how a fix should act, introduce `FixBehavior` to cover the differences between (e.g.) always-as-awarning and downgrade-to-warning. While here, split the `isWarning` predicate into two different predicates: * `canApplySolution`: Whether we can still apply a solution when it contains this particular fix. * `affectsSolutionScore`: Whether These two predicates are currently tied together, because that's the existing behavior, but we don't necessarily want them to stay that way.
This allows us to still maintain them in the score kind, but not treat them as being as severe as an error requiring a fix.
This avoids us having to go down the less-efficient "salvage" path when dealing with concurrency issues. It also fixes overloading behavior when dealing with `@preconcurrency` and `@Sendable` functions, such as in swiftlang#59909.
Rather than only setting the isolated-by-preconcurrency bit during constraint application, track the closures it will be set for as part of the constraint system and solution. Then, use that bit when performing "strict concurrency context" checks and type adjustments, so we don't treat an inferred-to-by-`@Sendable`-by-preconcurrency closure in the solver as if it weren't related to preconcurrency. Fixes the spurious warning from swiftlang#59910.
|
@swift-ci please smoke test |
|
Note: only the last commit is new, building on top of #59958 |
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.
Rather than only setting the isolated-by-preconcurrency bit during
constraint application, track the closures it will be set for as part
of the constraint system and solution. Then, use that bit when
performing "strict concurrency context" checks and type adjustments,
so we don't treat an inferred-to-by-
@Sendable-by-preconcurrencyclosure in the solver as if it weren't related to preconcurrency.
Fixes the spurious warning from #59910.