Use the correct type for Self in generic classes and generic interfaces
#4087
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
This comment was marked as resolved.
This comment was marked as resolved.
arguments matching the parameters. Perform substitution into generic instances.
zygoloid
force-pushed
the
toolchain-generic-4
branch
from
1378559
to
108dcf6
Compare
josh11b
reviewed
Jun 27, 2024
toolchain/check/generic.h
Outdated
|
|
||
| // Builds the generic instance corresponding to the generic itself. For example, | ||
| // for a generic `G(T:! type)`, this is `G(T)`. | ||
| auto MakeUnsubstitutedGenericInstance(Context& context, |
There was a problem hiding this comment.
"Unsubstituted" doesn't convey this to me, maybe?
Suggested change
| auto MakeUnsubstitutedGenericInstance(Context& context, | |
| auto MakeSelfGenericInstance(Context& context, |
or
Suggested change
| auto MakeUnsubstitutedGenericInstance(Context& context, | |
| auto MakeCanonicalGenericInstance(Context& context, |
or
Suggested change
| auto MakeUnsubstitutedGenericInstance(Context& context, | |
| auto MakeRepresentativeGenericInstance(Context& context, |
There was a problem hiding this comment.
Went with a variation of the first option and updated the generics-in-the-toolchain design doc to call this the "self instance" rather than the "unsubstituted instance".
Comment on lines
13
to
15
| fn F[addr self: Self*]() -> Class(T)* { | ||
| return self; | ||
| } |
There was a problem hiding this comment.
Test it works in both directions?
Suggested change
| fn F[addr self: Self*]() -> Class(T)* { | |
| return self; | |
| } | |
| fn F[addr self: Self*]() -> Class(T)* { | |
| return self; | |
| } | |
| fn G[addr self: Class(T)*]() -> Self* { | |
| return self; | |
| } |
There was a problem hiding this comment.
Hm, I'm trying to test that it's the exact same type, not just that it's convertible. Maybe there's a better way to do that?
There was a problem hiding this comment.
I've changed this a bit to try to better test the types are the same. I'm still not really happy with it, but hopefully this will do for now.
josh11b
approved these changes
Jun 28, 2024
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.
In a
class C(T:! type), the typeSelfshould beC(T), not merelyC. Similarly, in aninterface I(T:! type), the type of self should beI(T), not merelyI.