Backport "Don't re-balance AndTypes arising from supertypes" to LTS (#…

…21124)

Backports #20400 to the LTS branch.

PR submitted by the release tooling.
[skip ci]

compiler/src/dotty/tools/dotc/core/TypeOps.scala

@@ -196,6 +196,10 @@ object TypeOps:
         // Mapping over a skolem creates a new skolem which by definition won't
         // be =:= to the original one.
         tp
+      case tp: SuperType =>
+        // Mapping a supertype might re-balance an AndType which is not permitted since
+        // we need the original order of parents for current super resolution.
+        tp
       case _ =>
         mapOver
     }

compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -255,7 +255,7 @@ trait TypeAssigner {
           else if (ctx.erasedTypes) cls.info.firstParent.typeConstructor
           else {
             val ps = cls.classInfo.parents
-            if (ps.isEmpty) defn.AnyType else ps.reduceLeft((x: Type, y: Type) => x & y)
+            if ps.isEmpty then defn.AnyType else ps.reduceLeft(AndType(_, _))
           }
         SuperType(cls.thisType, owntype)
 

tests/run/i20284.check

@@ -0,0 +1,15 @@
+Test 1
+D
+B
+C
+A
+Test 2
+D
+B
+C
+A
+Test 3
+D
+B
+C
+A

tests/run/i20284.scala

@@ -0,0 +1,54 @@
+trait A {
+  def print: Unit = println("A")
+}
+
+trait B extends A {
+  override def print: Unit = {
+    println("B")
+    super.print
+  }
+}
+
+trait C extends A {
+  override def print: Unit = {
+    println("C")
+    super.print
+  }
+}
+
+trait D extends B {
+  override def print: Unit = {
+    println("D")
+    super.print
+  }
+}
+
+trait BB extends B
+
+trait X
+trait Y
+trait Z
+
+class Test1 extends C with B with BB with D with X with Y with Z:
+  override def print: Unit = {
+    println("Test 1")
+    super.print
+  }
+
+class Test2 extends C with B with BB with D with X with Y {
+  override def print: Unit = {
+    println("Test 2")
+    super.print
+  }
+}
+
+class Test3 extends X with Y with Z with C with B with BB with D {
+  override def print: Unit = {
+    println("Test 3")
+    super.print
+  }
+}
+@main def Test =
+  new Test1().print
+  new Test2().print
+  new Test3().print