patmat: Separate regular subtyping checks from adapted checks

dwijnand · dwijnand · commit fbc2e6fc5f33 · 2021-09-11T18:58:49.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -533,7 +533,7 @@ class SpaceEngine(using Context) extends SpaceLogic {
   /** Is `tp1` a subtype of `tp2`?  */
   def isSubType(tp1: Type, tp2: Type): Boolean = trace(i"$tp1 <:< $tp2", debug, show = true) {
     if tp1 == constantNullType && !ctx.explicitNulls then tp2 == constantNullType
-    else adaptType(tp1, tp2) <:< tp2
+    else tp1 <:< tp2 || adaptType(tp1, tp2) <:< tp2
   }
 
   def isSameUnapply(tp1: TermRef, tp2: TermRef): Boolean =

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ class SpaceEngine(using Context) extends SpaceLogic {`
`533`	`533`	/** Is `tp1` a subtype of `tp2`? */
`534`	`534`	`def isSubType(tp1: Type, tp2: Type): Boolean = trace(i"$tp1 <:< $tp2", debug, show = true) {`
`535`	`535`	`if tp1 == constantNullType && !ctx.explicitNulls then tp2 == constantNullType`
`536`		`- else adaptType(tp1, tp2) <:< tp2`
	`536`	`+ else tp1 <:< tp2 \|\| adaptType(tp1, tp2) <:< tp2`
`537`	`537`	`}`
`538`	`538`
`539`	`539`	`def isSameUnapply(tp1: TermRef, tp2: TermRef): Boolean =`