Revert "Revert "Disable distribution of intersection types over applied types"" #23923
Conversation
This file contains hidden or 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
EugeneFlesselle
force-pushed
the
distributeAnd-revert-revert
branch
from
a5ec473 to
4d2442b
Compare
Contributor
Author
|
@hamzaremmal all ci-checks (including |
hamzaremmal
approved these changes
Sep 15, 2025
| +CC[X] <: SortedSet[X] with SortedSetOps[X, CC, CC[X]], | ||
| +WithFilterCC[x] <: IterableOps[x, WithFilterCC, WithFilterCC[x]] with Set[x]] extends SortedSetOps[A @uncheckedVariance, CC, CC[A @uncheckedVariance]] { | ||
| self: IterableOps[A, WithFilterCC, _] => | ||
| self: IterableOps[A, WithFilterCC, CC[A @uncheckedVariance]] => |
Member
There was a problem hiding this comment.
I checked both changes here with @sjrd and they should be fine.
Member
There was a problem hiding this comment.
I reverted the PR as I had doubt over this change and it was breaking everything.
Member
There was a problem hiding this comment.
Now I'm getting the following, but in unclear situations (clean build worked; recompiled with a clean scala3-libary-nonbootstrapped does not work).
[error] -- [E046] Cyclic Error: /localhome/doeraene/projects/dotty/library/src/scala/collection/Iterable.scala:992:11
[error] 992 | +CC[X] <: SortedSet[X] with SortedSetOps[X, CC, CC[X]],
[error] | ^
[error] | Cyclic reference involving trait SortedSet
[error] |
[error] | Run with -explain-cyclic for more details.s
[error] |
[error] | longer explanation available when compiling with `-explain`
Member
There was a problem hiding this comment.
Hum, no, cleaning the library project fixes it. But still, it means it's appearing under some separate/incremental compilation scenarios. :s
Member
It was a bad interaction with the build cache. I went ahead and completely disable it in the meantime. |
This was referenced Sep 23, 2025
odersky
added a commit
that referenced
this pull request
Nov 2, 2025
#24175) Fixes #24038 In the minimisation, the typer phase expanded ```scala case abcd: (h *: t, bh *: bt) => val (hh *: tt, bh *: bt) = abcd ``` into ```scala case abcd @ _:Tuple2[*:[h @ _, t @ _], *:[bh @ _, bt @ _]] => val $1$: (Any, Tuple, Any, Tuple) = abcd:((T, M[T]) & (h *: t, bh *: bt)) @unchecked match { case Tuple2.unapply[T, M[T]]( *:.unapply[Any, Tuple](hh @ _, tt @ _):(Any *: Tuple), *:.unapply[Any, Tuple](bh @ _, bt @ _):(Any *: Tuple)) => Tuple4.apply[Any, Tuple, Any, Tuple](hh, tt, bh, bt) } val hh: Any = $1$._1 val tt: Tuple = $1$._2 val bh: Any = $1$._3 val bt: Tuple = $1$._4 ``` Before the change in #23923 it would simplify `((T, M[T]) & (h *: t, bh *: bt))` into `(T & (h *: t), M[T] & (bh *: bt))` and thus generate: ```scala case abcd @ _:Tuple2[*:[h @ _, t @ _], *:[bh @ _, bt @ _]] => val $1$: (h, t, bh, bt) = abcd:(T & h *: t, M[T] & bh *: bt) @unchecked match { case Tuple2.unapply[T & h *: t, M[T] & bh *: bt]( *:.unapply[h, t](hh @ _, tt @ _), *:.unapply[bh, bt](bh @ _, bt @ _)) => Tuple4.apply[h, t, bh, bt](hh, tt, bh, bt) } val hh: h = $1$._1 val tt: t = $1$._2 val bh: bh = $1$._3 val bt: bt = $1$._4 ``` Since it looks like this simplification is now illegal, and the unapply generation for intersection types seems to prioritize the leftmost argument, to fix this we make sure that when typing Binds we prioritize the user-created `tree.tpe` and deprioritize the inferred proto type, which hopefully is enough.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Reverts #23920