Skip to content

Optimize and harden isCaptureChecking tests #24439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2025
Merged

Optimize and harden isCaptureChecking tests #24439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions compiler/src/dotty/tools/dotc/cc/CaptureOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,16 @@ private val Captures: Key[CaptureSet] = Key()

/** Are we at checkCaptures phase? */
def isCaptureChecking(using Context): Boolean =
ctx.phaseId == Phases.checkCapturesPhase.id
ctx.phaseId == Phases.checkCapturesPhaseId

/** Are we in the CheckCaptures or Setup phase? */
def isCaptureCheckingOrSetup(using Context): Boolean =
val ccPhase = Phases.checkCapturesPhase
ccPhase.exists
&& {
val ccId = ccPhase.id
val ctxId = ctx.phaseId
ctxId == ccId
|| ctxId == ccId - 1 && ccState.iterationId > 0
// Note: just checking phase id is not enough since Setup would
// also be the phase after pattern matcher.
}
val ccId = Phases.checkCapturesPhaseId
val ctxId = ctx.phaseId
ctxId == ccId
|| ctxId == ccId - 1 && ccState.iterationId > 0
// Note: just checking phase id is not enough since Setup would
// also be the phase after pattern matcher.

/** A dependent function type with given arguments and result type
* TODO Move somewhere else where we treat all function type related ops together.
Expand Down
9 changes: 9 additions & 0 deletions compiler/src/dotty/tools/dotc/core/Phases.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ object Phases {
else
this.fusedPhases = this.phases

if myCheckCapturesPhase.exists then
myCheckCapturesPhaseId = myCheckCapturesPhase.id

config.println(s"Phases = ${phases.toList}")
config.println(s"nextDenotTransformerId = ${nextDenotTransformerId.toList}")
}
Expand Down Expand Up @@ -257,6 +260,10 @@ object Phases {
private var myGenBCodePhase: Phase = uninitialized
private var myCheckCapturesPhase: Phase = uninitialized

private var myCheckCapturesPhaseId: Int = -2
// -1 means undefined, 0 means NoPhase, we make sure that we don't get a false hit
// if ctx.phaseId is either of these.

final def parserPhase: Phase = myParserPhase
final def typerPhase: Phase = myTyperPhase
final def postTyperPhase: Phase = myPostTyperPhase
Expand Down Expand Up @@ -285,6 +292,7 @@ object Phases {
final def flattenPhase: Phase = myFlattenPhase
final def genBCodePhase: Phase = myGenBCodePhase
final def checkCapturesPhase: Phase = myCheckCapturesPhase
final def checkCapturesPhaseId: Int = myCheckCapturesPhaseId

private def setSpecificPhases() = {
def phaseOfClass(pclass: Class[?]) = phases.find(pclass.isInstance).getOrElse(NoPhase)
Expand Down Expand Up @@ -570,6 +578,7 @@ object Phases {
def flattenPhase(using Context): Phase = ctx.base.flattenPhase
def genBCodePhase(using Context): Phase = ctx.base.genBCodePhase
def checkCapturesPhase(using Context): Phase = ctx.base.checkCapturesPhase
def checkCapturesPhaseId(using Context): Int = ctx.base.checkCapturesPhaseId

def unfusedPhases(using Context): Array[Phase] = ctx.base.phases

Expand Down
Loading