Skip to content

Fix isFullyDefined trace #16748

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
Feb 12, 2023
Merged

Fix isFullyDefined trace #16748

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
1 change: 1 addition & 0 deletions compiler/src/dotty/tools/dotc/printing/Formatting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ object Formatting {
given Show[util.SourceFile] = ShowAny
given Show[util.Spans.Span] = ShowAny
given Show[tasty.TreeUnpickler#OwnerTree] = ShowAny
given Show[typer.ForceDegree.Value] = ShowAny

private def show1[A: Show](x: A)(using Context) = show2(Show[A].show(x).ctxShow)
private def show2(x: Shown)(using Context): String = x match
Expand Down
32 changes: 18 additions & 14 deletions compiler/src/dotty/tools/dotc/typer/Inferencing.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,18 @@ object Inferencing {

private var toMaximize: List[TypeVar] = Nil

def apply(x: Boolean, tp: Type): Boolean =
try tp.dealias match
def apply(x: Boolean, tp: Type): Boolean = trace(i"isFullyDefined($tp, $force)", typr) {
try {
val tpd = tp.dealias
if tpd ne tp then apply(x, tpd)
else tp match
case _: WildcardType | _: ProtoType =>
false
case tvar: TypeVar if !tvar.isInstantiated =>
force.appliesTo(tvar)
&& ctx.typerState.constraint.contains(tvar)
&& {
var fail = false
val direction = instDirection(tvar.origin)
if minimizeSelected then
if direction <= 0 && tvar.hasLowerBound then
Expand All @@ -190,17 +194,16 @@ object Inferencing {
else if variance >= 0 && (force.ifBottom == IfBottom.ok || tvar.hasLowerBound) then
instantiate(tvar, fromBelow = true)
else if variance >= 0 && force.ifBottom == IfBottom.fail then
return false
fail = true
else
toMaximize = tvar :: toMaximize
foldOver(x, tvar)
}
case tp =>
reporting.trace(s"IFT $tp") {
foldOver(x, tp)
!fail && foldOver(x, tvar)
}
case tp => foldOver(x, tp)
}
catch case ex: Throwable =>
handleRecursive("check fully defined", tp.show, ex)
}

def process(tp: Type): Boolean =
// Maximize type vars in the order they were visited before */
Expand Down Expand Up @@ -767,13 +770,14 @@ trait Inferencing { this: Typer =>
end constrainIfDependentParamRef
}

/** An enumeration controlling the degree of forcing in "is-dully-defined" checks. */
/** An enumeration controlling the degree of forcing in "is-fully-defined" checks. */
@sharable object ForceDegree {
class Value(val appliesTo: TypeVar => Boolean, val ifBottom: IfBottom)
val none: Value = new Value(_ => false, IfBottom.ok)
val all: Value = new Value(_ => true, IfBottom.ok)
val failBottom: Value = new Value(_ => true, IfBottom.fail)
val flipBottom: Value = new Value(_ => true, IfBottom.flip)
class Value(val appliesTo: TypeVar => Boolean, val ifBottom: IfBottom):
override def toString = s"ForceDegree.Value(.., $ifBottom)"
val none: Value = new Value(_ => false, IfBottom.ok) { override def toString = "ForceDegree.none" }
val all: Value = new Value(_ => true, IfBottom.ok) { override def toString = "ForceDegree.all" }
val failBottom: Value = new Value(_ => true, IfBottom.fail) { override def toString = "ForceDegree.failBottom" }
val flipBottom: Value = new Value(_ => true, IfBottom.flip) { override def toString = "ForceDegree.flipBottom" }
}

enum IfBottom:
Expand Down