Fix inference of one-arg return_type method
#49407
Merged
Conversation
This file contains 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
`Core.Compiler.return_type` has two methods:
- return_type(f, args::Type{<:Tuple})
- return_type(args::Type{<:Tuple})
Our inference code was only catching the first one.
Expand it to support both.
aviatesk
approved these changes
Apr 19, 2023
| end | ||
| argtypes_vec = Any[aft, af_argtype.parameters...] | ||
| else | ||
| argtypes_vec = Any[af_argtype.parameters...] |
There was a problem hiding this comment.
Maybe we should perform a check that is equivalent to (f, tt::DataType) case here?
Suggested change
| argtypes_vec = Any[af_argtype.parameters...] | |
| aft = af_argtype.parameters[1] | |
| if (!(isType(aft) && !has_free_typevars(aft)) && | |
| !(isconcretetype(aft) && !(aft <: Builtin))) | |
| return UNKNOWN | |
| end | |
| argtypes_vec = Any[af_argtype.parameters...] |
There was a problem hiding this comment.
I don't think it's required. That check in the other branch is just to avoid accidentally catching the interp method.
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.
Core.Compiler.return_typehas two methods:Our inference code was only catching the first one. Expand it to support both.