More robust check for subsumes

scala · Oct 9, 2024 · cb6605c · cb6605c
1 parent c20ae8f
commit cb6605c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/compiler/src/dotty/tools/dotc/cc/CaptureRef.scala b/compiler/src/dotty/tools/dotc/cc/CaptureRef.scala
@@ -110,8 +110,8 @@ trait CaptureRef extends TypeProxy, ValueType:
 
     def viaInfo(info: Type)(test: Type => Boolean): Boolean = info.match
       case info: SingletonCaptureRef => test(info)
-      case info: AndType => test(info.tp1) || test(info.tp2)
-      case info: OrType => test(info.tp1) && test(info.tp2)
+      case info: AndType => viaInfo(info.tp1)(test) || viaInfo(info.tp2)(test)
+      case info: OrType => viaInfo(info.tp1)(test) && viaInfo(info.tp2)(test)
       case _ => false
 
     (this eq y)
@@ -123,7 +123,7 @@ trait CaptureRef extends TypeProxy, ValueType:
                 this.subsumes(ypre)
                 || this.match
                     case x @ TermRef(xpre: CaptureRef, _) if x.symbol == y.symbol =>
-                      subsumingRefs(xpre, ypre) && subsumingRefs(ypre, xpre)
+                      withMode(Mode.IgnoreCaptures) {TypeComparer.isSameRef(xpre, ypre)}
                     case _ =>
                       false
               case _ => false