Skip to content

Conversation

hamzaremmal
Copy link
Member

Lets try to merge again #21890

@hamzaremmal hamzaremmal force-pushed the mixin-forwarder branch 2 times, most recently from 9c4398f to fdd15a4 Compare September 17, 2025 09:47
@hamzaremmal hamzaremmal marked this pull request as ready for review September 17, 2025 09:47
@hamzaremmal hamzaremmal requested a review from sjrd September 17, 2025 09:48
hamzaremmal and others added 8 commits September 17, 2025 15:46
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.
@hamzaremmal
Copy link
Member Author

#23963 it took me all the afternoon yesterday to migrate and update just a little of the CB.
To not stop progress here, I'm rewriting the sbt-bridge changes in a Java 8 syntax.

@hamzaremmal hamzaremmal force-pushed the mixin-forwarder branch 2 times, most recently from 8ebc65a to d6e9a75 Compare September 21, 2025 15:33
val memberTpe = if sym.is(MixedIn) then
mixinPhase.asInstanceOf[Mixin].mixinForwarderGenericInfos.get(sym) match
case Some(genericInfo) => genericInfo
case none => computeMemberTpe()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not None

@hamzaremmal hamzaremmal merged commit 9bd7774 into scala:main Sep 21, 2025
49 checks passed
@hamzaremmal hamzaremmal deleted the mixin-forwarder branch September 21, 2025 17:07
@tgodzik
Copy link
Contributor

tgodzik commented Sep 22, 2025

Should we try backporting it to LTS ? @hamzaremmal ?

@hamzaremmal
Copy link
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.

@He-Pin
Copy link
Contributor

He-Pin commented Sep 22, 2025

But that will affect the Play users?

@sjrd
Copy link
Member

sjrd commented Sep 22, 2025

Oh no no no; don't backport this.

@tgodzik
Copy link
Contributor

tgodzik commented Sep 22, 2025

It did seem to be a bit risky yeah, thanks for confirming Sebastien!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants