Skip to content

Commit 5439e98

Browse files
committed
Remove unnecessary and recursive Space decomposition
Space decomposition recently learnt to decompose prefixes. Given a nested definition like in i19031, aggressively trying to decompose while intersecting can lead to recursive decompositions (building bigger and bigger nested prefixes). Turns out the decomposition isn't necessary.
1 parent dbb97ca commit 5439e98

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,13 @@ object SpaceEngine {
210210
case (a @ Typ(tp1, _), b @ Typ(tp2, _)) =>
211211
if isSubType(tp1, tp2) then a
212212
else if isSubType(tp2, tp1) then b
213-
else if canDecompose(a) then intersect(Or(decompose(a)), b)
214-
else if canDecompose(b) then intersect(a, Or(decompose(b)))
215213
else intersectUnrelatedAtomicTypes(tp1, tp2)(a)
216214
case (a @ Typ(tp1, _), Prod(tp2, fun, ss)) =>
217215
if isSubType(tp2, tp1) then b
218-
else if canDecompose(a) then intersect(Or(decompose(a)), b)
219216
else if isSubType(tp1, tp2) then a // problematic corner case: inheriting a case class
220217
else intersectUnrelatedAtomicTypes(tp1, tp2)(b)
221218
case (Prod(tp1, fun, ss), b @ Typ(tp2, _)) =>
222219
if isSubType(tp1, tp2) then a
223-
else if canDecompose(b) then intersect(a, Or(decompose(b)))
224220
else if isSubType(tp2, tp1) then a // problematic corner case: inheriting a case class
225221
else intersectUnrelatedAtomicTypes(tp1, tp2)(a)
226222
case (a @ Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) =>

tests/pos/i19031.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//> using options -Werror
2+
3+
sealed trait A:
4+
class B extends A
5+
6+
class Test:
7+
def t1(a: A): Boolean =
8+
a match
9+
case b: A#B => true

0 commit comments

Comments
 (0)