Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,28 @@ trait PatternTypeConstrainer { self: TypeComparer =>
val andType = buildAndType(baseClasses)
!andType.exists || constrainPatternType(pat, andType)
case _ =>
val upcasted: Type = scrut match {
case scrut: TypeProxy => scrut.superType
case _ => NoType
def tryGadtBounds = scrut match {
case scrut: TypeRef =>
ctx.gadt.bounds(scrut.symbol) match {
case tb: TypeBounds =>
val hi = tb.hi
constrainPatternType(pat, hi)
case null => true
}
case _ => true
}
if (upcasted.exists)
tryConstrainSimplePatternType(pat, upcasted) || constrainUpcasted(upcasted)
else true

def trySuperType =
val upcasted: Type = scrut match {
case scrut: TypeProxy =>
scrut.superType
case _ => NoType
}
if (upcasted.exists)
tryConstrainSimplePatternType(pat, upcasted) || constrainUpcasted(upcasted)
else true

tryGadtBounds && trySuperType
}
}

Expand Down
21 changes: 21 additions & 0 deletions tests/pos/i15274.orig.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
enum Format[A]:
case Str[Next](next: Format[Next]) extends Format[(String, Next)]
case Num[Next](next: Format[Next]) extends Format[(Int, Next)]
case Constant[Next](value: String, next: Format[Next]) extends Format[Next]
case Done extends Format[Unit]

def printf[A](format: Format[A], params: A): Unit = (format, params) match
case (Format.Done, ()) =>
()

case (Format.Constant(value, next), params) =>
println(value)
printf(next, params)

case (Format.Str(next), (str, rest)) =>
println(str)
printf(next, rest)

case (Format.Num(next), (i, rest)) =>
println(i)
printf(next, rest)
6 changes: 6 additions & 0 deletions tests/pos/i15274.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
enum Format[A]:
case Str[Next](next: Format[Next]) extends Format[(String, Next)]

def printf[A](format: Format[A], params: A): Unit = (format, params) match
case (Format.Str(next), (str, rest)) =>
val s: String = str