Aligns | Nothing with & Any and Nothing | with Any & for value types.

This also fixes `summon[ClassTag[Int | Nothing]]` as it is now equivalent to `summon[ClassTag[Int]]`.

Fixes #14970
Fixes #14964

> ⚠️ This is a binary breaking change.

> the Previous version generated the `def f: Int` and `def f: Object` variants of the method.
> In the new one, we only generate the `def f: Int` version.
> Unfortunately, the previous version called the boxed version of the interface that does not exist anymore.
>
> Is this something that we encounter in practice?

Author: nicolasstucki

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

@@ -365,10 +365,18 @@ object TypeErasure {
   def erasedLub(tp1: Type, tp2: Type)(using Context): Type = {
     // After erasure, C | {Null, Nothing} is just C, if C is a reference type.
     // We need to short-circuit this case here because the regular lub logic below
-    // relies on the class hierarchy, which doesn't properly capture `Null`s subtyping
+    // relies on the class hierarchy, which doesn't properly capture `Null`/`Nothing`s subtyping
     // behaviour.
     if (tp1.isBottomTypeAfterErasure && tp2.derivesFrom(defn.ObjectClass)) return tp2
     if (tp2.isBottomTypeAfterErasure && tp1.derivesFrom(defn.ObjectClass)) return tp1
+
+    // After erasure, A | Nothing is just A, if A is a value type.
+    // We need to short-circuit this case here because the regular lub logic below
+    // relies on the class hierarchy, which doesn't properly capture `Nothing`s subtyping
+    // behaviour.
+    if (tp1.isExactlyNothing && tp2.derivesFrom(defn.AnyValClass)) return valueErasure(tp2)
+    if (tp2.isExactlyNothing && tp1.derivesFrom(defn.AnyValClass)) return valueErasure(tp1)
+
     tp1 match {
       case JavaArrayType(elem1) =>
         import dotty.tools.dotc.transform.TypeUtils._

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -13,7 +13,7 @@ import scala.tools.asm.Opcodes
 import scala.jdk.CollectionConverters._
 import Opcodes._
 
-class TestBCode extends DottyBytecodeTest {
+class DottyBytecodeTests extends DottyBytecodeTest {
   import ASMConverters._
   @Test def nullChecks = {
     val source = """
@@ -1234,6 +1234,27 @@ class TestBCode extends DottyBytecodeTest {
         Label(9), Op(IRETURN)))
     }
   }
+
+  /** Check that erasure if `Int | Nothing` is `int` */
+  @Test def i14970 = {
+    val source =
+      s"""class Foo {
+         |  def foo: Int | Nothing = 1
+         |  def bar: Nothing | Int = 1
+         |}
+         """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn      = dir.lookupName("Foo.class", directory = false).input
+      val clsNode    = loadClassNode(clsIn)
+      def testSig(methodName: String, expectedSignature: String) = {
+        val signature = clsNode.methods.asScala.filter(_.name == methodName).map(_.signature)
+        assertEquals(List(expectedSignature), signature)
+      }
+      testSig("foo", "()I")
+      testSig("bar", "()I")
+    }
+  }
 }
 
 object invocationReceiversTestCode {

tests/neg/i5823.scala

@@ -7,7 +7,7 @@ class A
 class B
 
 class Foo {
-  
+
   // ok, because A and B are <: Object.
   def foo(a: A|Null): Unit = ()
   def foo(b: B|Null): Unit = ()
@@ -26,13 +26,15 @@ class Foo {
   def foo2(a: A|Nothing): Unit = ()
   def foo2(b: B|Nothing): Unit = ()
 
+  // ok because erased to primitive types
   def bar2(a: Int|Nothing): Unit = ()
-  def bar2(b: Boolean|Nothing): Unit = () // error: signatures match
+  def bar2(b: Boolean|Nothing): Unit = ()
 
   // ok, T is erased to `String` and `Integer`, respectively
   def gen3[T <: String](s: T|Nothing): Unit = ()
   def gen3[T <: Integer](i: T|Nothing): Unit = ()
 
+  // ok because erased to primitive types
   def gen4[T <: Int](i: T|Nothing): Unit = ()
-  def gen4[T <: Boolean](b: T|Nothing): Unit = () // error: signatures match
+  def gen4[T <: Boolean](b: T|Nothing): Unit = ()
 }

tests/run/i14964.scala

@@ -0,0 +1,5 @@
+@main def Test: Unit =
+  val xs = (1, 2).toList
+  val a1 = xs.toArray
+  println((1, 2).toList.toArray)
+  val a2 = (1, 2).toList.toArray

tests/run/i14964b.check

@@ -0,0 +1,4 @@
+Int
+Int
+Int
+Int

tests/run/i14964b.scala

@@ -0,0 +1,5 @@
+@main def Test: Unit =
+  println(summon[reflect.ClassTag[Int]]) // classOf[Int]
+  println(summon[reflect.ClassTag[Int | Int]]) // classOf[Int]
+  println(summon[reflect.ClassTag[Int | 1]]) // classOf[Int]
+  println(summon[reflect.ClassTag[Int | Nothing]]) // classOf[Object]