[ConstraintSystem] Replace curry level with a boolean flag #19947
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
Since arbitrary currying is no longer allowed `level` could be replaced with the boolean flag which identifies if curried `self` should be skipped or not.
xedin
force-pushed
the
replace-curry-level-with-flag
branch
2 times, most recently
from
8db4762 to
0baff82
Compare
slavapestov
approved these changes
Oct 19, 2018
lib/Sema/CalleeCandidateInfo.h
Outdated
| @@ -59,7 +59,7 @@ namespace swift { | |||
| /// | |||
| struct UncurriedCandidate { | |||
There was a problem hiding this comment.
Perhaps worth renaming this too :)
There was a problem hiding this comment.
Are you thinking just to Candidate? :)
There was a problem hiding this comment.
OverloadCandidate maybe
There was a problem hiding this comment.
Sounds good! I'll do that in this PR and cleanup documentation around this.
slavapestov
reviewed
Oct 19, 2018
lib/Sema/CSSimplify.cpp
Outdated
| @@ -587,13 +587,13 @@ getCalleeDeclAndArgs(ConstraintSystem &cs, | |||
| SmallVector<LocatorPathElt, 2> path; | |||
| auto callExpr = callLocator.getLocatorParts(path); | |||
| if (!callExpr) | |||
| return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure); | |||
| return std::make_tuple(nullptr, false, argLabels, hasTrailingClosure); | |||
There was a problem hiding this comment.
When passing ‘false’ as an argument like this it might be more readable if it said: /*hasCurriedSelf=*/false
There was a problem hiding this comment.
Ah, sure, makes sense!
Arbitrary currying is no longer allowed so level could be switched to a boolean flag for methods like `computeDefaultMap` to identify if they need to look through curried self type or not.
xedin
force-pushed
the
replace-curry-level-with-flag
branch
from
0baff82 to
e20723f
Compare
…ype` -> `OverloadCandidate::get{Function}Type`
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@swift-ci please test source compatibility |
1 similar comment
|
@swift-ci please test source compatibility |
|
Deserialization failures in debug source compatibility suite are unrelated to my changes. |
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.
Arbitrary currying is no longer allowed so level could be switched
to a boolean flag for methods like
computeDefaultMapto identifyif they need to look through curried self type or not.