Merge pull request #13251 from dwijnand/unreachable-match-type-subpattern

Author: dwijnand

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

@@ -702,13 +702,18 @@ object TypeOps:
     //
     // 1. Replace type parameters in T with tvars
     // 2. Replace `A.this.C` with `A#C` (see tests/patmat/i12681.scala)
+    // 3. Replace non-reducing MatchType with its bound
     //
     val approximateParent = new TypeMap {
       val boundTypeParams = util.HashMap[TypeRef, TypeVar]()
 
       def apply(tp: Type): Type = tp.dealias match {
-        case _: MatchType =>
-          tp // break cycles
+        case tp: MatchType =>
+          val reduced = tp.reduced
+          if reduced.exists then tp // break cycles
+          else mapOver(tp.bound) // if the match type doesn't statically reduce
+                                 // then to avoid it failing the <:<
+                                 // we'll approximate by widening to its bounds
 
         case ThisType(tref: TypeRef) if !tref.symbol.isStaticOwner =>
           tref
@@ -729,7 +734,7 @@ object TypeOps:
             tv
           end if
 
-        case AppliedType(tycon: TypeRef, _) if !tycon.dealias.typeSymbol.isClass =>
+        case tp @ AppliedType(tycon: TypeRef, _) if !tycon.dealias.typeSymbol.isClass && !tp.isMatchAlias =>
 
           // In tests/patmat/i3645g.scala, we need to tell whether it's possible
           // that K1 <: K[Foo]. If yes, we issue a warning; otherwise, no

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

@@ -427,10 +427,7 @@ object Types {
     def isMatch(using Context): Boolean = stripped match {
       case _: MatchType => true
       case tp: HKTypeLambda => tp.resType.isMatch
-      case tp: AppliedType =>
-        tp.tycon match
-          case tycon: TypeRef => tycon.info.isInstanceOf[MatchAlias]
-          case _ => false
+      case tp: AppliedType => tp.isMatchAlias
       case _ => false
     }
 

tests/patmat/i13189.scala

@@ -0,0 +1,89 @@
+// original report
+def foo(opt: Option[Tuple.Tail[NonEmptyTuple]]): Unit =
+  opt match
+    case None => ???
+    case Some(a) => ???
+
+
+// again with a mini-Tuple with the extra NonEmptyTupExtra parent, to test transitivity
+object WithExtraParent:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed trait NonEmptyTup extends Tup
+  sealed trait NonEmptyTupExtra extends NonEmptyTup
+  sealed abstract class **:[+H, +T <: Tup] extends NonEmptyTupExtra
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithExtraParent
+
+
+// again with a non-abstract parent
+object WithNonAbstractParent:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed class NonEmptyTup extends Tup
+  sealed class **:[+H, +T <: Tup] extends NonEmptyTup
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithNonAbstractParent
+
+
+// again with multiple children, but an exhaustive match
+object WithExhaustiveMatch:
+  sealed trait Tup
+
+  object Tup {
+    type Tail[X <: NonEmptyTup] <: Tup = X match {
+      case _ **: xs => xs
+      case _ *+: xs => xs
+    }
+  }
+
+  object EmptyTup extends Tup
+
+  sealed trait NonEmptyTup extends Tup
+  sealed abstract class **:[+H, +T <: Tup] extends NonEmptyTup
+  sealed abstract class *+:[+H, +T <: Tup] extends NonEmptyTup
+
+  object **: {
+    def unapply[H, T <: Tup](x: H **: T): (H, T) = null
+  }
+  object *+: {
+    def unapply[H, T <: Tup](x: H *+: T): (H, T) = null
+  }
+
+  def foo(opt: Option[Tup.Tail[NonEmptyTup]]): Unit =
+    opt match
+      case None => ???
+      case Some(a) => ???
+end WithExhaustiveMatch