Merge pull request #617 from scala/backport-lts-3.3-23482

Backport "No mixin forwarder when ancestor is sealed" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -320,7 +320,7 @@ private sealed trait XSettings:
   val XmixinForceForwarders = ChoiceSetting(
     name    = "-Xmixin-force-forwarders",
     helpArg = "mode",
-    descr   = "Generate forwarder methods in classes inhering concrete methods from traits.",
+    descr   = "Generate forwarder methods in classes inheriting concrete methods from traits.",
     choices = List("true", "junit", "false"),
     default = "true")
 

compiler/src/dotty/tools/dotc/transform/Mixin.scala

@@ -93,7 +93,7 @@ object Mixin {
  *                <mods> def x_=(y: T) = ()
  *
  *          4.5 (done in `mixinForwarders`) For every method
- *          `<mods> def f[Ts](ps1)...(psN): U` imn M` that needs to be disambiguated:
+ *          `<mods> def f[Ts](ps1)...(psN): U` in M` that needs to be disambiguated:
  *
  *                <mods> def f[Ts](ps1)...(psN): U = super[M].f[Ts](ps1)...(psN)
  *

compiler/src/dotty/tools/dotc/transform/MixinOps.scala

@@ -47,32 +47,39 @@ class MixinOps(cls: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
       cls.info.nonPrivateMember(sym.name).hasAltWith(_.symbol == sym)
     }
 
-  /** Does `method` need a forwarder to in  class `cls`
-   *  Method needs a forwarder in those cases:
+  /** Does `method` need a forwarder in class `cls`?
+   *  Method needs a forwarder in these cases:
    *   - there's a class defining a method with same signature
    *   - there are multiple traits defining method with same signature
    */
-  def needsMixinForwarder(meth: Symbol): Boolean = {
+  def needsMixinForwarder(meth: Symbol): Boolean =
     lazy val competingMethods = competingMethodsIterator(meth).toList
 
-    def needsDisambiguation = competingMethods.exists(x=> !x.is(Deferred)) // multiple implementations are available
+    def needsDisambiguation = competingMethods.exists(!_.is(Deferred)) // multiple implementations are available
     def hasNonInterfaceDefinition = competingMethods.exists(!_.owner.is(Trait)) // there is a definition originating from class
 
     // JUnit 4 won't recognize annotated default methods, so always generate a forwarder for them.
     def generateJUnitForwarder: Boolean =
-      meth.annotations.nonEmpty && JUnit4Annotations.exists(annot => meth.hasAnnotation(annot)) &&
+      meth.annotations.nonEmpty && JUnit4Annotations.exists(meth.hasAnnotation) &&
         ctx.settings.mixinForwarderChoices.isAtLeastJunit
 
     // Similarly, Java serialization won't take into account a readResolve/writeReplace default method.
     def generateSerializationForwarder: Boolean =
        (meth.name == nme.readResolve || meth.name == nme.writeReplace) && meth.info.paramNamess.flatten.isEmpty
 
-    !meth.isConstructor &&
-    meth.is(Method, butNot = PrivateOrAccessorOrDeferred) &&
-    (ctx.settings.mixinForwarderChoices.isTruthy || meth.owner.is(Scala2x) || needsDisambiguation || hasNonInterfaceDefinition ||
-     generateJUnitForwarder || generateSerializationForwarder) &&
-    isInImplementingClass(meth)
-  }
+    !meth.isConstructor
+    && meth.is(Method, butNot = PrivateOrAccessorOrDeferred)
+    && (!meth.is(JavaDefined) || !meth.owner.is(Sealed) || meth.owner.children.contains(cls))
+    && (
+         ctx.settings.mixinForwarderChoices.isTruthy
+      || meth.owner.is(Scala2x)
+      || needsDisambiguation
+      || hasNonInterfaceDefinition
+      || generateJUnitForwarder
+      || generateSerializationForwarder
+    )
+    && isInImplementingClass(meth)
+  end needsMixinForwarder
 
   final val PrivateOrAccessor: FlagSet = Private | Accessor
   final val PrivateOrAccessorOrDeferred: FlagSet = Private | Accessor | Deferred

tests/run/i23479/NonSeal.java

@@ -0,0 +1,3 @@
+// test: -jvm 17+
+public non-sealed interface NonSeal extends Seal {
+}

tests/run/i23479/Seal.java

@@ -0,0 +1,6 @@
+
+public sealed interface Seal permits NonSeal {
+    default int g() {
+        return 42;
+    }
+}

tests/run/i23479/test.scala

@@ -0,0 +1,4 @@
+// scalajs: --skip
+class C() extends NonSeal
+
+@main def Test = C()

tests/run/i23479b.scala

@@ -0,0 +1,13 @@
+// scalajs: --skip
+trait Ord[A]
+
+object Ord:
+  sealed trait Rev[A] extends Ord[A]:
+    def reverse: Rev[A] = this
+
+  trait IntOrd extends Ord[Int]
+
+  object Int extends IntOrd with Rev[Int]
+
+@main def Test =
+  assert(Ord.Int.getClass.getDeclaredMethods.map(_.getName).toList.contains("reverse"))