fix #31899, type intersection involving Int in upper bound #31960
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
JeffBezanson
added
types and dispatch
vtjnash
reviewed
May 7, 2019
| @@ -1779,7 +1781,10 @@ static jl_value_t *finish_unionall(jl_value_t *res JL_MAYBE_UNROOTED, jl_varbind | |||
| jl_tvar_t *newvar = vb->var; | |||
| JL_GC_PUSH2(&res, &newvar); | |||
| // try to reduce var to a single value | |||
| if (obviously_egal(vb->lb, vb->ub)) { | |||
| if (jl_is_long(vb->ub) && jl_is_typevar(vb->lb)) { | |||
There was a problem hiding this comment.
jl_is_typevar(vb->lb)
IIUC, doesn't this also need checks that vb->ub <: jl_any_type && vb->lb >: Union{}?
There was a problem hiding this comment.
Yes, that would be more precise, I just wanted to be conservative here and also not complicate the code too much.
vtjnash
reviewed
May 7, 2019
src/subtype.c
Outdated
| @@ -961,6 +961,8 @@ static int subtype(jl_value_t *x, jl_value_t *y, jl_stenv_t *e, int param) | |||
| if (yy) record_var_occurrence(yy, e, param); | |||
| if (yr) { | |||
| if (xx) record_var_occurrence(xx, e, param); | |||
| if (xx->lb == jl_bottom_type) | |||
| return 1; // allow Bottom <: non-type | |||
| return subtype(xx->lb, yy->ub, e, 0); | |||
There was a problem hiding this comment.
I would have thought subtype should already handle lhs == Union{}, instead of needing to add a fast-path here to catch some cases of it just for the egal case?
There was a problem hiding this comment.
Yeah, it should be ok to change that. I thought there might be some reason we don't have that general fast path, but I'm not sure what it would be.
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.
No description provided.