[Sema] Avoid getCalleeLocator() with inner call that is still variable type. #75664
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
|
@swift-ci Please smoke test. |
|
@swift-ci Please smoke test. |
xedin
requested changes
Aug 12, 2024
| @@ -2080,13 +2080,16 @@ ConstraintSystem::matchFunctionResultTypes(Type expectedResult, Type fnResult, | |||
| auto anchor = locator.getAnchor(); | |||
| if (auto *callExpr = getAsExpr<CallExpr>(anchor)) { | |||
| if (auto *innerCall = getAsExpr<CallExpr>(callExpr->getSemanticFn())) { | |||
| auto *innerCalleeLoc = | |||
| if (!simplifyType(getType(innerCall->getFn())) | |||
| ->is<TypeVariableType>()) { | |||
There was a problem hiding this comment.
I think this is wrong for the cases with IUO because this means that the follow-up logic that checks selected overload won't have it and the solver won't potentially end up not adding disjunction for the IUO. We need a test-case that verifies that...
I think this logic needs to be moved to simplifyApplicableFnConstraint and if the inner call doesn't have an overload selected yet we need to delay simplication of ApplicableFunction constraint until it is selected.
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.
getCalleeLocator()at ConstraintSystem.cpp:681 asserts that the function type is not a type variable. (The assert got added after Swift 5.10 it looks like, which is why this is a regression.) In this particular spot, if there is an unresolved overload skip checking the inner overload choice, avoiding the call. (Later on when the type variable is bound, simplifying here happens again and succeeds.)Resolves #75623.