inference: limit single-level nested Type signature
#40379
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
Previously `type_more_complex` returns `false` for `Type{Type{...}}`
compared against `Type{...}`. Per comment there, this should return `true`,
but the code was ordered incorrect (it was also missing support for
Vararg, after the recent changes).
Fixes #40336
Co-authored-by: Shuhei Kadowaki <aviatesk@gmail.com>
aviatesk
approved these changes
Apr 7, 2021
| if isa(c, DataType) | ||
| if isa(c, Core.TypeofVararg) | ||
| # Tuple{Vararg{T}} --> Tuple{T} is OK | ||
| return _limit_type_size(t, c.T, sources, depth, 0) |
There was a problem hiding this comment.
Suggested change
| return _limit_type_size(t, c.T, sources, depth, 0) | |
| return _limit_type_size(t, unwrapva(c), sources, depth, 0) |
for the consistency with the other parts ?
|
@nanosoldier |
|
Your benchmark job has completed - possible performance regressions were detected. A full report can be found here. cc @christopher-dG |
ElOceanografo
pushed a commit
to ElOceanografo/julia
that referenced
this pull request
May 4, 2021
Previously `type_more_complex` returns `false` for `Type{Type{...}}`
compared against `Type{...}`. Per comment there, this should return `true`,
but the code was ordered incorrect (it was also missing support for
Vararg, after the recent changes).
Fixes JuliaLang#40336
Co-authored-by: Shuhei Kadowaki <aviatesk@gmail.com>
antoine-levitt
pushed a commit
to antoine-levitt/julia
that referenced
this pull request
May 9, 2021
Previously `type_more_complex` returns `false` for `Type{Type{...}}`
compared against `Type{...}`. Per comment there, this should return `true`,
but the code was ordered incorrect (it was also missing support for
Vararg, after the recent changes).
Fixes JuliaLang#40336
Co-authored-by: Shuhei Kadowaki <aviatesk@gmail.com>
aviatesk
added a commit
that referenced
this pull request
May 28, 2021
Fixes the inference regression, while retaining the cases addressed by <#40379>. The same `Type`-name comparison pass (i.e. a branch of `isa(c, DataType) && t.name === c.name`) can lead to more accurate result by recursive comparison than `isType` check pass (i.e. a branch of `isType(t)`), and preferring the former over the latter fixes the regression. But just swapping the branch will lead to <#40336>, and so this PR also implements additional check to make sure `type_more_complex` still detects a single-level nesting correctly (especially, the `tt === c` parts).
aviatesk
added a commit
that referenced
this pull request
May 31, 2021
Fixes the inference regression, while retaining the cases addressed by <#40379>. The same `Type`-name comparison pass (i.e. a branch of `isa(c, DataType) && t.name === c.name`) can lead to more accurate result by recursive comparison than `isType` check pass (i.e. a branch of `isType(t)`), and preferring the former over the latter fixes the regression. But just swapping the branch will lead to <#40336>, and so this PR also implements additional check to make sure `type_more_complex` still detects a single-level nesting correctly (especially, the `tt === c` parts).
johanmon
pushed a commit
to johanmon/julia
that referenced
this pull request
Jul 5, 2021
Previously `type_more_complex` returns `false` for `Type{Type{...}}`
compared against `Type{...}`. Per comment there, this should return `true`,
but the code was ordered incorrect (it was also missing support for
Vararg, after the recent changes).
Fixes JuliaLang#40336
Co-authored-by: Shuhei Kadowaki <aviatesk@gmail.com>
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_more_complexreturnsfalseforType{Type{...}}compared against
Type{...}. Per comment there, this should returntrue,but the code was ordered incorrect (it was also missing support for
Vararg, after the recent changes).
Fixes #40336, Replaces #40341
@aviatesk I think this is a more complete fix, that matches the intent of the comment there.