[Sema] Extend callee diagnoses to non-conforming complex args including generics. #1229
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
gregomni
changed the title
| @@ -282,6 +282,9 @@ ERROR(cannot_convert_argument_value,none, | |||
| (Type,Type)) | |||
| ERROR(cannot_convert_argument_value_protocol,none, | |||
| "argument type %0 does not conform to expected type %1", (Type, Type)) | |||
| ERROR(cannot_convert_partial_argument_value_protocol,none, | |||
| "in argument type %0, %1 does not conform to expected type %2", (Type, Type, Type)) | |||
There was a problem hiding this comment.
Formatting -- line up with ( on previous line
There was a problem hiding this comment.
Oops, committed a fix.
|
It looks like there are some conflicts to resolve? |
|
Also do you mind squashing the two patches together into one? It's logically one change. |
gregomni
force-pushed
the
generic-func-args
branch
from
66501a5 to
2c40f90
Compare
|
Yep: Fixed conflict, merged and squashed. |
…rics. Previously, type checking arguments worked fine if the entire arg was UnresolvedType, but if the type just contained UnresolvedType, the constraint system always failed via explicitly constraining to unresolved. Now in TypeCheckConstraints, if the solution allows for free variables that are UnresolvedType, then also convert any incoming UnresolvedTypes into variables. At worst, in the solution these just get converted back into the same Unresolved that they started with. This change allows for incorrect tuple/function type possibilities to make it back out to CSDiag, where they can be more precisely diagnosed with callee info. The rest of the changes are to correctly figure out the failure info when evaluating more types of Types. New diagnosis for a partial part of an arg type not confroming. Tests added for that. Expected errors changed in several places where we now get real types in the diagnosis instead of '(_)' unresolved.
gregomni
force-pushed
the
generic-func-args
branch
from
2c40f90 to
10370a5
Compare
|
This ran into another conflict a couple days ago, with a new commit cf2e7f6. Fixed that conflict, merged and squashed. I have another set of changes over this same ground that extends to multiple generic args. Would you like to see that as another commit here, or as a separate pull? |
|
Let's do it as a separate PR. I don't want you to keep rebasing this forever :) @swift-ci Please test |
slavapestov
added a commit
that referenced
this pull request
Feb 15, 2016
[Sema] Extend callee diagnoses to non-conforming complex args including generics.
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.
Previously, type checking arguments worked fine if the entire arg was UnresolvedType, but if the type just contained UnresolvedType, the constraint system always failed via explicitly constraining to unresolved.
Now in TypeCheckConstraints, if the solution allows for free variables that are UnresolvedType, then also convert any incoming UnresolvedTypes into variables. At worst, in the solution these just get converted back into the same Unresolved that they started with.
This change allows for incorrect tuple/function type possibilities to make it back out to CSDiag, where they can be more precisely diagnosed with callee info. The rest of the changes are to correctly figure out the failure info when evaluating more types of Types.
New diagnosis for a partial part of an arg type not conforming. Tests added for that. Expected errors changed in several places where we now get real types in the diagnosis instead of '(_)' unresolved.
This is a followup to #1160 and #1200.