Skip to content

Add gadtAddBound to ExplainingTypeComparer tracing #15819

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
Aug 18, 2022
Merged

Add gadtAddBound to ExplainingTypeComparer tracing #15819

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
20 changes: 9 additions & 11 deletions compiler/src/dotty/tools/dotc/core/TypeComparer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
private def isBottom(tp: Type) = tp.widen.isRef(NothingClass)

protected def gadtBounds(sym: Symbol)(using Context) = ctx.gadt.bounds(sym)
protected def gadtAddLowerBound(sym: Symbol, b: Type): Boolean = ctx.gadt.addBound(sym, b, isUpper = false)
protected def gadtAddUpperBound(sym: Symbol, b: Type): Boolean = ctx.gadt.addBound(sym, b, isUpper = true)
protected def gadtAddBound(sym: Symbol, b: Type, isUpper: Boolean): Boolean = ctx.gadt.addBound(sym, b, isUpper)

protected def typeVarInstance(tvar: TypeVar)(using Context): Type = tvar.underlying

Expand Down Expand Up @@ -1947,7 +1946,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
if (bound.isRef(tparam)) false
else
val savedGadt = ctx.gadt.fresh
val success = if isUpper then gadtAddUpperBound(tparam, bound) else gadtAddLowerBound(tparam, bound)
val success = gadtAddBound(tparam, bound, isUpper)
if !success then ctx.gadt.restore(savedGadt)
success
}
Expand Down Expand Up @@ -2930,15 +2929,9 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
super.gadtBounds(sym)
}

override def gadtAddLowerBound(sym: Symbol, b: Type): Boolean = {
override def gadtAddBound(sym: Symbol, b: Type, isUpper: Boolean): Boolean =
if (sym.exists) footprint += sym.typeRef
super.gadtAddLowerBound(sym, b)
}

override def gadtAddUpperBound(sym: Symbol, b: Type): Boolean = {
if (sym.exists) footprint += sym.typeRef
super.gadtAddUpperBound(sym, b)
}
super.gadtAddBound(sym, b, isUpper)

override def typeVarInstance(tvar: TypeVar)(using Context): Type = {
footprint += tvar
Expand Down Expand Up @@ -3118,5 +3111,10 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
super.addConstraint(param, bound, fromBelow)
}

override def gadtAddBound(sym: Symbol, b: Type, isUpper: Boolean): Boolean =
traceIndented(s"add GADT constraint ${show(sym)} ${if isUpper then "<:" else ">:"} ${show(b)} $frozenNotice, GADT constraint = ${show(ctx.gadt.debugBoundsDescription)}") {
super.gadtAddBound(sym, b, isUpper)
}

def lastTrace(header: String): String = header + { try b.toString finally b.clear() }
}