Ignore capture sets in certain cases of subtyping #22183
+60
−8
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
noti0na1
reviewed
Dec 11, 2024
| @@ -12,8 +12,4 @@ def either[T1, T2, Cap^]( | |||
| src2: Source[T2, Cap]^{Cap^}): Source[Either[T1, T2], Cap]^{Cap^} = | |||
| val left = src1.transformValuesWith(Left(_)) | |||
| val right = src2.transformValuesWith(Right(_)) | |||
| race[Either[T1, T2], Cap](left, right) | |||
There was a problem hiding this comment.
The extension methods above can be tested as well. I remember they have similar issues.
There was a problem hiding this comment.
It causes an infinite regress now, looking into it.
|
We should have standalone file to test the subtyping: def test[C^] =
val a: C = ???
val b: CapSet^{C^} = a
val c: C = b
val d: CapSet^{C^, ...} = a
...We also want to test nested types are still working: def test[C^, D^] =
A[C] <:< A[CapSet^{C^}] // ok
A[C] <:< A[CapSet^{D^}] // error
A[C]^{D^} <:< A[CapSet^{D^}]^{D^} // error |
bracevac
force-pushed
the
capture-subtyping
branch
from
7acd730 to
7d8b439
Compare
bracevac
commented
Dec 22, 2024
| val d: CapSet^{C^, c} = a | ||
|
|
||
| // TODO: make "CapSet-ness" of type variables somehow contagious? | ||
| // Then we don't have to spell out the bounds explicitly... |
There was a problem hiding this comment.
We should support that. Say we have def foo[C^, D <: C, E >: C], then we should automatically constraint both D and E to be capture set variables, i.e., D is implicitly lower-bounded by CapSet, and E is implicitly upper-bounded by CapSet^
bracevac
commented
Dec 22, 2024
| val d_e_f2: CapSet^{D^,E^,F^} = e1 | ||
| val d_e_f3: CapSet^{D^,E^,F^} = f1 | ||
| val f2: F = d_e_f1 | ||
| val c3: C = d_e_f1 // error |
There was a problem hiding this comment.
This line and the three following lines are all not flagged as errors, but they should be. Investigating.
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.
Fixes #22103
If
Cis a capture-set variable, then a comparisonC <: CapSet^{C^}would previously fail in theTypeComparerdue to a level mismatch resulting in the testCapSet^ <: CapSet.For such cases, we now ignore the LHS capture annotation. This is controlled by a new bit in the
ApproxStateof theTypeComparer.