[ConstraintSystem] A couple of improvements to multi-statement closure handling #58915
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
|
I failed to reduce a test-case for "Solver left free type variables" which a regular closure but that was triggered by #58879 in one of the result builder bodies, so we kind of have a test-case for that in the suite :) |
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
|
@swift-ci please test source compatibility debug |
|
@swift-ci please test source compatibility release |
…holders during ambiguity Since conjunction is not going to continue current solver path after discovering an ambiguity, let's just mark all of the unbound outer variables as placeholders to produce a complete solution.
If missing member is found in e.g. case statement or a pattern, let's attach diagnostic directly to it.
xedin
force-pushed
the
multi-statement-closure-improvements
branch
from
d68a43c to
e7ad6e4
Compare
While producing a combined solution, let's reflect the number of fixes and holes discovered in the conjunction, that way it would be possible to filter solutions and keep track of the fact that there were issues in the conjunction.
This was an incorrect locator since constraints do belong to a sequence expression and not to a contextual pattern.
xedin
force-pushed
the
multi-statement-closure-improvements
branch
from
e7ad6e4 to
f210442
Compare
|
@swift-ci please test |
This was referenced May 19, 2022
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.
Conjunction: Transform all unbound outer variables into placeholders during ambiguity
Since there is no solver follow-up after ambiguity has been detected in the body of a closure,
let's just mark all of the unbound type variables as holes while forming a solution, otherwise
CS.finalize()would crash withSolver left free type variables.Improve diagnostic precision by attaching missing member diagnostic to an affected pattern/statement.
Conjunction: Propagate fix and hole scores to outer solution
While producing a combined solution, let's reflect the number of
fixes and holes discovered in the conjunction, that way it would
be possible to filter solutions and keep track of the fact that
there were issues in the conjunction.
Resolves: rdar://92854767