Merge pull request #14118 from dwijnand/contrareach

Fix reachability by retaining spaces of Prod params

Author: dwijnand

compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

@@ -212,14 +212,20 @@ trait SpaceLogic {
         if (isSubType(tp2, tp1)) b
         else if (canDecompose(tp1)) tryDecompose1(tp1)
         else if (isSubType(tp1, tp2)) a // problematic corner case: inheriting a case class
-        else intersectUnrelatedAtomicTypes(tp1, tp2)
+        else intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun, ss)
+          case sp         => sp
       case (Prod(tp1, fun, ss), Typ(tp2, _)) =>
         if (isSubType(tp1, tp2)) a
         else if (canDecompose(tp2)) tryDecompose2(tp2)
         else if (isSubType(tp2, tp1)) a  // problematic corner case: inheriting a case class
-        else intersectUnrelatedAtomicTypes(tp1, tp2)
+        else intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun, ss)
+          case sp         => sp
       case (Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) =>
-        if (!isSameUnapply(fun1, fun2)) intersectUnrelatedAtomicTypes(tp1, tp2)
+        if (!isSameUnapply(fun1, fun2)) intersectUnrelatedAtomicTypes(tp1, tp2) match
+          case Typ(tp, _) => Prod(tp, fun1, ss1)
+          case sp         => sp
         else if (ss1.zip(ss2).exists(p => simplify(intersect(p._1, p._2)) == Empty)) Empty
         else Prod(tp1, fun1, ss1.zip(ss2).map((intersect _).tupled))
     }

tests/patmat/i14102.min.scala

@@ -0,0 +1,7 @@
+trait Foo[-X]
+case class Bar(n: Int) extends Foo[Nothing]
+
+def test[X](foo: Foo[X]) = foo match
+  case Bar(1) =>
+  case Bar(_) =>
+  case _      =>

tests/patmat/i14102.scala

@@ -0,0 +1,8 @@
+trait T[-X]
+case class CC[-X](x: List[T[X]]) extends T[Nothing]
+case class Id[-X](x: String) extends T[X]
+
+def f[X](tree: T[X]) = tree match
+  case CC(Id("hi") :: Nil) => ???
+  case CC(refs) => ???
+  case _ => ???