fix regression with generic params in static type #24075
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
metagn
added a commit
to metagn/applicates
that referenced
this pull request
Sep 7, 2024
metagn
force-pushed
the
static-generic-param-regression
branch
from
268237a to
3873d06
Compare
|
Thanks for your hard work on this PR! Hint: mm: orc; opt: speed; options: -d:release |
narimiran
pushed a commit
that referenced
this pull request
Dec 16, 2024
Caught in https://github.com/metagn/applicates, I'm not sure which commit causes this but it's also in the 2.0 branch (but not 2.0.2), so it's not any recent PRs. If a proc has a static parameter with type `static Foo[T]`, then another parameter with type `static Bar[T, U]`, the generic instantiation for `Bar` doesn't match `U` which has type `tyGenericParam`, but matches `T` since it has type `tyTypeDesc`. The reason is that `concreteType` returns the type itself for `tyTypeDesc` if `c.isNoCall` (i.e. matching a generic invocation), but returns `nil` for `tyGenericParam`. I'm guessing `tyGenericParam` is received here because of #22618, but that doesn't explain why `T` is still `tyTypeDesc`. I'm not sure. Regardless, we can just copy the behavior for `tyTypeDesc` to `tyGenericParam` and also return the type itself when `c.isNoCall`. This feels like it defeats the purpose of `concreteType` but the way it's used doesn't make sense without it (generic param can't match another generic param?). Alternatively we could loosen the `if concrete == nil: return isNone` checks in some places for specific conditions, whether `c.isNoCall` or `c.inGenericContext == 0` (though this would need (cherry picked from commit 24e5b21)
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.
Caught in https://github.com/metagn/applicates, I'm not sure which commit causes this but it's also in the 2.0 branch (but not 2.0.2), so it's not any recent PRs.
If a proc has a static parameter with type
static Foo[T], then another parameter with typestatic Bar[T, U], the generic instantiation forBardoesn't matchUwhich has typetyGenericParam, but matchesTsince it has typetyTypeDesc. The reason is thatconcreteTypereturns the type itself fortyTypeDescifc.isNoCall(i.e. matching a generic invocation), but returnsnilfortyGenericParam. I'm guessingtyGenericParamis received here because of #22618, but that doesn't explain whyTis stilltyTypeDesc. I'm not sure.Regardless, we can just copy the behavior for
tyTypeDesctotyGenericParamand also return the type itself whenc.isNoCall. This feels like it defeats the purpose ofconcreteTypebut the way it's used doesn't make sense without it (generic param can't match another generic param?). Alternatively we could loosen theif concrete == nil: return isNonechecks in some places for specific conditions, whetherc.isNoCallorc.inGenericContext == 0(though this would need #24005).