-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[CS] Make resolveLocatorToDecl simpler and more robust #27836
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
hamishknight
merged 6 commits into
swiftlang:master
from
hamishknight:second-hand-callees
Oct 23, 2019
Merged
[CS] Make resolveLocatorToDecl simpler and more robust #27836
hamishknight
merged 6 commits into
swiftlang:master
from
hamishknight:second-hand-callees
Oct 23, 2019
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
This is a convenience member for computing the contextual substitutions for a decl reference at a given locator.
Some clients may only want a callee locator for an immediate decl reference such as `x.foo`, but not for `x.foo()`.
Rather than attempting to pull out a concrete decl ref from the rewritten function expr, retrieve the callee from the solution using a callee locator computed before the apply is rewritten, and then pass this callee down through `finishApply` and `coerceCallArguments`. Resolves SR-11648.
This ensures we don't have to compute the substitutions multiple times when, for example, rewriting an apply of generic function.
hamishknight
commented
Oct 22, 2019
@swift-ci please test |
@swift-ci please smoke test |
xedin
approved these changes
Oct 23, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, thank you!
@swift-ci please smoke 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.
Rather than attempting to pull out a concrete callee reference from the rewritten function expression, this PR changes the logic such that we retrieve the callee from the solution using a callee locator computed before the apply is rewritten, and then pass this callee down through
finishApply
andcoerceCallArguments
.Resolves SR-11648.