Emit mixin forwarders as ordinary, non-bridge methods again#23942
Merged
hamzaremmal merged 10 commits intoscala:mainfrom Sep 21, 2025
Merged
Emit mixin forwarders as ordinary, non-bridge methods again#23942hamzaremmal merged 10 commits intoscala:mainfrom
hamzaremmal merged 10 commits intoscala:mainfrom
Conversation
9c4398f to
fdd15a4
Compare
sjrd
approved these changes
Sep 17, 2025
This reverts commit 700eea7. Forward port of scala/scala@96f844e
This reverts commit 6d0f9ca. Forward port of most commits in scala/scala#8037 Compensate some of the consequences by adding the `MixedIn` flag. In addition to the use seen in the diff in `BCodeHelpers`, the JS backend has an existing test for `isOneOf(Bridge | MixedIn)` which needs this compensation.
This is a forward port of scala/scala@6fc2202 In Scala 2 that commit was reverting a commit that had stopped emitting Java generic signatures. In dotc we never had that logic before, so this is new code.
…ler cannot build everything correctly
373b096 to
f4330f0
Compare
Co-authored-by: Hamza Remmal <hamza@remmal.net>
cec4a04 to
17c93cc
Compare
sjrd
approved these changes
Sep 19, 2025
Member
Author
|
#23963 it took me all the afternoon yesterday to migrate and update just a little of the CB. |
8ebc65a to
d6e9a75
Compare
d6e9a75 to
aa267b2
Compare
He-Pin
reviewed
Sep 21, 2025
| val memberTpe = if sym.is(MixedIn) then | ||
| mixinPhase.asInstanceOf[Mixin].mixinForwarderGenericInfos.get(sym) match | ||
| case Some(genericInfo) => genericInfo | ||
| case none => computeMemberTpe() |
Contributor
|
Should we try backporting it to LTS ? @hamzaremmal ? |
Member
Author
|
This is debatable, I'm more towards not backporting it since 3.3.7 will start emitting code that 3.4.0 doesn't emit. |
Contributor
|
But that will affect the Play users? |
Member
|
Oh no no no; don't backport this. |
Contributor
|
It did seem to be a bit risky yeah, thanks for confirming Sebastien! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
Lets try to merge again #21890