[5.7-04182022][ConstraintSystem] A couple of callAsFunction fixes
#58795
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
If there is a call to `init` on a callable type that has a trailing closure, let's avoid filtering because it's impossible to tell whether a trailing closure belongs to an `init` call or implicit `.callAsFunction` that would be attempted after it. Resolves: rdar://92912878 (cherry picked from commit d81007c) (cherry picked from commit 4955e51)
…AsFunction` A call to `.callAsFunction` could be injected after initializer if the type is callable, `getCalleeLocator` should recognize that situation and return appropriate locator otherwise if `callAsFunction` has e.g. a result builder attached to one of its parameters the solver wouldn't be able to find it. Resolves: rdar://92914226 (cherry picked from commit f7c4ff6) (cherry picked from commit 557d83c)
|
@swift-ci please test |
xedin
changed the title
callAsFunction fixes
tkremenek
approved these changes
May 11, 2022
AnthonyLatsis
added
🍒 release cherry pick
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.
Cherry-pick of #58778
Cherry-pick of #58793
Explanation:
Both fixes represent usability improvements for
callAsFunction.Avoid filtering
initoverloads of a callable type if a call has a trailing closure. Filteringprevents from picking an overload that is going to work with implicit
callAsFunctioncall.Fix a situation where result builder attached to a
callAsFunctionparameter couldnot be discovered due to incorrect locator.
Scope: Calls to
initof a callable type that have trailing closuresMain Branch PR: [CSSimplify] Avoid filtering
initoverloads of a callable type #58778, [ConstraintSystem] AdjustgetCalleeLocatorto handle implicit `call… #587935.7 Branch PR: [5.7][ConstraintSystem] A couple of
callAsFunctionfixes #58794Resolves: rdar://92912878, rdar://92914226
Risk: Very low
Reviewed By: @hborla
Testing: Added regression test-cases to the suite.
Resolves: rdar://92912878
Resolves: rdar://92914226