From 0a95e899a4e37347e107ecef3d729346144bef55 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 3 Sep 2024 09:52:29 +0100 Subject: [PATCH 1/2] Drop trace.force in CaptureSet This was showing up in testCompilation runs, locally or in CI. --- compiler/src/dotty/tools/dotc/cc/CaptureSet.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala b/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala index 25d8e0bc6506..1cf587f8f03a 100644 --- a/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala +++ b/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala @@ -159,7 +159,7 @@ sealed abstract class CaptureSet extends Showable: */ def accountsFor(x: CaptureRef)(using Context): Boolean = if comparer.isInstanceOf[ExplainingTypeComparer] then // !!! DEBUG - reporting.trace.force(i"$this accountsFor $x, ${x.captureSetOfInfo}?", show = true): + reporting.trace(i"$this accountsFor $x, ${x.captureSetOfInfo}?", show = true): elems.exists(_.subsumes(x)) || !x.isMaxCapability && x.captureSetOfInfo.subCaptures(this, frozen = true).isOK else From 2fbd42ecf7a2d943ce323e9bd9f26fa89f527930 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 6 Sep 2024 12:50:30 +0100 Subject: [PATCH 2/2] Drop if in CaptureSet --- compiler/src/dotty/tools/dotc/cc/CaptureSet.scala | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala b/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala index 1cf587f8f03a..c57ad639783c 100644 --- a/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala +++ b/compiler/src/dotty/tools/dotc/cc/CaptureSet.scala @@ -158,14 +158,9 @@ sealed abstract class CaptureSet extends Showable: * as frozen. */ def accountsFor(x: CaptureRef)(using Context): Boolean = - if comparer.isInstanceOf[ExplainingTypeComparer] then // !!! DEBUG - reporting.trace(i"$this accountsFor $x, ${x.captureSetOfInfo}?", show = true): - elems.exists(_.subsumes(x)) - || !x.isMaxCapability && x.captureSetOfInfo.subCaptures(this, frozen = true).isOK - else - reporting.trace(i"$this accountsFor $x, ${x.captureSetOfInfo}?", show = true): - elems.exists(_.subsumes(x)) - || !x.isMaxCapability && x.captureSetOfInfo.subCaptures(this, frozen = true).isOK + reporting.trace(i"$this accountsFor $x, ${x.captureSetOfInfo}?", show = true): + elems.exists(_.subsumes(x)) + || !x.isMaxCapability && x.captureSetOfInfo.subCaptures(this, frozen = true).isOK /** A more optimistic version of accountsFor, which does not take variable supersets * of the `x` reference into account. A set might account for `x` if it accounts