Skip to content

Commit 58d0a29

Browse files
dwijnandKordyjan
dwijnand
authored and
Kordyjan
committed
Rename GadtConstraintHandling to GadtState
1 parent 92c5dad commit 58d0a29

File tree

14 files changed

+63
-73
lines changed

14 files changed

+63
-73
lines changed

‎compiler/src/dotty/tools/dotc/core/Contexts.scala‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ object Contexts {
141141
def tree: Tree[?]
142142
def scope: Scope
143143
def typerState: TyperState
144-
def gadt: GadtConstraintHandling
144+
def gadt: GadtConstraint = gadtState.gadt
145+
def gadtState: GadtState
145146
def searchHistory: SearchHistory
146147
def source: SourceFile
147148

@@ -410,7 +411,7 @@ object Contexts {
410411
val constrCtx = outersIterator.dropWhile(_.outer.owner == owner).next()
411412
superOrThisCallContext(owner, constrCtx.scope)
412413
.setTyperState(typerState)
413-
.setGadt(gadt)
414+
.setGadtState(gadtState)
414415
.fresh
415416
.setScope(this.scope)
416417
}
@@ -541,8 +542,8 @@ object Contexts {
541542
private var _typerState: TyperState = uninitialized
542543
final def typerState: TyperState = _typerState
543544

544-
private var _gadt: GadtConstraintHandling = uninitialized
545-
final def gadt: GadtConstraintHandling = _gadt
545+
private var _gadtState: GadtState = uninitialized
546+
final def gadtState: GadtState = _gadtState
546547

547548
private var _searchHistory: SearchHistory = uninitialized
548549
final def searchHistory: SearchHistory = _searchHistory
@@ -567,7 +568,7 @@ object Contexts {
567568
_owner = origin.owner
568569
_tree = origin.tree
569570
_scope = origin.scope
570-
_gadt = origin.gadt
571+
_gadtState = origin.gadtState
571572
_searchHistory = origin.searchHistory
572573
_source = origin.source
573574
_moreProperties = origin.moreProperties
@@ -624,12 +625,12 @@ object Contexts {
624625
this._scope = typer.scope
625626
setTypeAssigner(typer)
626627

627-
def setGadt(gadt: GadtConstraintHandling): this.type =
628-
util.Stats.record("Context.setGadt")
629-
this._gadt = gadt
628+
def setGadtState(gadtState: GadtState): this.type =
629+
util.Stats.record("Context.setGadtState")
630+
this._gadtState = gadtState
630631
this
631632
def setFreshGADTBounds: this.type =
632-
setGadt(gadt.fresh)
633+
setGadtState(gadtState.fresh)
633634

634635
def setSearchHistory(searchHistory: SearchHistory): this.type =
635636
util.Stats.record("Context.setSearchHistory")
@@ -721,7 +722,7 @@ object Contexts {
721722
.updated(notNullInfosLoc, Nil)
722723
.updated(compilationUnitLoc, NoCompilationUnit)
723724
c._searchHistory = new SearchRoot
724-
c._gadt = GadtConstraintHandling(GadtConstraint.empty)
725+
c._gadtState = GadtState(GadtConstraint.empty)
725726
c
726727
end FreshContext
727728

‎compiler/src/dotty/tools/dotc/core/GadtConstraint.scala‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,14 @@ class GadtConstraint private (
133133
): GadtConstraint = GadtConstraint(myConstraint, mapping, reverseMapping, wasConstrained)
134134
end GadtConstraint
135135

136-
object GadtConstraintHandling:
137-
def apply(gadt: GadtConstraint): GadtConstraintHandling = new ProperGadtConstraintHandling(gadt)
136+
object GadtState:
137+
def apply(gadt: GadtConstraint): GadtState = ProperGadtState(gadt)
138138

139-
sealed trait GadtConstraintHandling(private var myGadt: GadtConstraint) {
140-
this: ConstraintHandling =>
139+
sealed trait GadtState {
140+
this: ConstraintHandling => // Hide ConstraintHandling within GadtConstraintHandling
141141

142-
def gadt: GadtConstraint = myGadt
143-
private def gadt_=(g: GadtConstraint) = myGadt = g
144-
145-
/** Exposes ConstraintHandling.subsumes */
146-
def subsumes(left: GadtConstraint, right: GadtConstraint, pre: GadtConstraint)(using Context): Boolean = {
147-
def extractConstraint(g: GadtConstraint) = g.constraint
148-
subsumes(extractConstraint(left), extractConstraint(right), extractConstraint(pre))
149-
}
142+
def gadt: GadtConstraint
143+
def gadt_=(g: GadtConstraint): Unit
150144

151145
override protected def legalBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Type =
152146
// GADT constraints never involve wildcards and are not propagated outside
@@ -233,13 +227,6 @@ sealed trait GadtConstraintHandling(private var myGadt: GadtConstraint) {
233227
result
234228
}
235229

236-
def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean = gadt.isLess(sym1, sym2)
237-
def fullBounds(sym: Symbol)(using Context): TypeBounds | Null = gadt.fullBounds(sym)
238-
def bounds(sym: Symbol)(using Context): TypeBounds | Null = gadt.bounds(sym)
239-
def contains(sym: Symbol)(using Context): Boolean = gadt.contains(sym)
240-
def isNarrowing: Boolean = gadt.isNarrowing
241-
def symbols: List[Symbol] = gadt.symbols
242-
243230
/** See [[ConstraintHandling.approximation]] */
244231
def approximation(sym: Symbol, fromBelow: Boolean, maxLevel: Int = Int.MaxValue)(using Context): Type = {
245232
approximation(gadt.tvarOrError(sym).origin, fromBelow, maxLevel).match
@@ -252,7 +239,7 @@ sealed trait GadtConstraintHandling(private var myGadt: GadtConstraint) {
252239
.showing(i"approximating $sym ~> $result", gadts)
253240
}
254241

255-
def fresh: GadtConstraintHandling = GadtConstraintHandling(gadt)
242+
def fresh: GadtState = GadtState(gadt)
256243

257244
/** Restore the GadtConstraint state. */
258245
def restore(gadt: GadtConstraint): Unit = this.gadt = gadt
@@ -281,5 +268,7 @@ sealed trait GadtConstraintHandling(private var myGadt: GadtConstraint) {
281268
override def constr = gadtsConstr
282269
}
283270

284-
// Hide ConstraintHandling within GadtConstraintHandling
285-
private class ProperGadtConstraintHandling(gadt: GadtConstraint) extends ConstraintHandling with GadtConstraintHandling(gadt)
271+
// Hide ConstraintHandling within GadtState
272+
private class ProperGadtState(private var myGadt: GadtConstraint) extends ConstraintHandling with GadtState:
273+
def gadt: GadtConstraint = myGadt
274+
def gadt_=(gadt: GadtConstraint): Unit = myGadt = gadt

‎compiler/src/dotty/tools/dotc/core/NamerOps.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,11 @@ object NamerOps:
212212
* by (ab?)-using GADT constraints. See pos/i941.scala.
213213
*/
214214
def linkConstructorParams(sym: Symbol, tparams: List[Symbol], rhsCtx: Context)(using Context): Unit =
215-
rhsCtx.gadt.addToConstraint(tparams)
215+
rhsCtx.gadtState.addToConstraint(tparams)
216216
tparams.lazyZip(sym.owner.typeParams).foreach { (psym, tparam) =>
217217
val tr = tparam.typeRef
218-
rhsCtx.gadt.addBound(psym, tr, isUpper = false)
219-
rhsCtx.gadt.addBound(psym, tr, isUpper = true)
218+
rhsCtx.gadtState.addBound(psym, tr, isUpper = false)
219+
rhsCtx.gadtState.addBound(psym, tr, isUpper = true)
220220
}
221221

222222
end NamerOps

‎compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ trait PatternTypeConstrainer { self: TypeComparer =>
261261
val assumeInvariantRefinement =
262262
migrateTo3 || forceInvariantRefinement || refinementIsInvariant(patternTp)
263263

264-
trace(i"constraining simple pattern type $tp >:< $pt", gadts, (res: Boolean) => i"$res gadt = ${ctx.gadt.gadt}") {
264+
trace(i"constraining simple pattern type $tp >:< $pt", gadts, (res: Boolean) => i"$res gadt = ${ctx.gadt}") {
265265
(tp, pt) match {
266266
case (AppliedType(tyconS, argsS), AppliedType(tyconP, argsP)) =>
267267
val saved = state.nn.constraint
268268
val result =
269-
ctx.gadt.rollbackGadtUnless {
269+
ctx.gadtState.rollbackGadtUnless {
270270
tyconS.typeParams.lazyZip(argsS).lazyZip(argsP).forall { (param, argS, argP) =>
271271
val variance = param.paramVarianceSign
272272
if variance == 0 || assumeInvariantRefinement ||

‎compiler/src/dotty/tools/dotc/core/Symbols.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ object Symbols {
686686
addToGadt: Boolean = true,
687687
flags: FlagSet = EmptyFlags)(using Context): Symbol = {
688688
val sym = newSymbol(ctx.owner, name, Case | flags, info, coord = span)
689-
if (addToGadt && name.isTypeName) ctx.gadt.addToConstraint(sym)
689+
if (addToGadt && name.isTypeName) ctx.gadtState.addToConstraint(sym)
690690
sym
691691
}
692692

‎compiler/src/dotty/tools/dotc/core/TypeComparer.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
116116
private def isBottom(tp: Type) = tp.widen.isRef(NothingClass)
117117

118118
protected def gadtBounds(sym: Symbol)(using Context) = ctx.gadt.bounds(sym)
119-
protected def gadtAddBound(sym: Symbol, b: Type, isUpper: Boolean): Boolean = ctx.gadt.addBound(sym, b, isUpper)
119+
protected def gadtAddBound(sym: Symbol, b: Type, isUpper: Boolean): Boolean = ctx.gadtState.addBound(sym, b, isUpper)
120120

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

@@ -1443,10 +1443,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
14431443
else if tp1 eq tp2 then true
14441444
else
14451445
val savedCstr = constraint
1446-
val savedGadt = ctx.gadt.gadt
1446+
val savedGadt = ctx.gadt
14471447
inline def restore() =
14481448
state.constraint = savedCstr
1449-
ctx.gadt.restore(savedGadt)
1449+
ctx.gadtState.restore(savedGadt)
14501450
val savedSuccessCount = successCount
14511451
try
14521452
recCount += 1
@@ -1852,34 +1852,34 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
18521852
*/
18531853
private def necessaryEither(op1: => Boolean, op2: => Boolean): Boolean =
18541854
val preConstraint = constraint
1855-
val preGadtHandling = ctx.gadt.fresh
1856-
val preGadt = preGadtHandling.gadt
1855+
val preGadt = ctx.gadt
18571856

18581857
def allSubsumes(leftGadt: GadtConstraint, rightGadt: GadtConstraint, left: Constraint, right: Constraint): Boolean =
1859-
subsumes(left, right, preConstraint) && preGadtHandling.subsumes(leftGadt, rightGadt, preGadt)
1858+
subsumes(left, right, preConstraint)
1859+
&& subsumes(leftGadt.constraint, rightGadt.constraint, preGadt.constraint)
18601860

18611861
if op1 then
18621862
val op1Constraint = constraint
1863-
val op1Gadt = ctx.gadt.gadt
1863+
val op1Gadt = ctx.gadt
18641864
constraint = preConstraint
1865-
ctx.gadt.restore(preGadt)
1865+
ctx.gadtState.restore(preGadt)
18661866
if op2 then
1867-
if allSubsumes(op1Gadt, ctx.gadt.gadt, op1Constraint, constraint) then
1868-
gadts.println(i"GADT CUT - prefer ${ctx.gadt.gadt} over $op1Gadt")
1867+
if allSubsumes(op1Gadt, ctx.gadt, op1Constraint, constraint) then
1868+
gadts.println(i"GADT CUT - prefer ${ctx.gadt} over $op1Gadt")
18691869
constr.println(i"CUT - prefer $constraint over $op1Constraint")
1870-
else if allSubsumes(ctx.gadt.gadt, op1Gadt, constraint, op1Constraint) then
1871-
gadts.println(i"GADT CUT - prefer $op1Gadt over ${ctx.gadt.gadt}")
1870+
else if allSubsumes(ctx.gadt, op1Gadt, constraint, op1Constraint) then
1871+
gadts.println(i"GADT CUT - prefer $op1Gadt over ${ctx.gadt}")
18721872
constr.println(i"CUT - prefer $op1Constraint over $constraint")
18731873
constraint = op1Constraint
1874-
ctx.gadt.restore(op1Gadt)
1874+
ctx.gadtState.restore(op1Gadt)
18751875
else
18761876
gadts.println(i"GADT CUT - no constraint is preferable, reverting to $preGadt")
18771877
constr.println(i"CUT - no constraint is preferable, reverting to $preConstraint")
18781878
constraint = preConstraint
1879-
ctx.gadt.restore(preGadt)
1879+
ctx.gadtState.restore(preGadt)
18801880
else
18811881
constraint = op1Constraint
1882-
ctx.gadt.restore(op1Gadt)
1882+
ctx.gadtState.restore(op1Gadt)
18831883
true
18841884
else op2
18851885
end necessaryEither
@@ -2051,7 +2051,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
20512051
gadts.println(i"narrow gadt bound of $tparam: ${tparam.info} from ${if (isUpper) "above" else "below"} to $bound ${bound.toString} ${bound.isRef(tparam)}")
20522052
if (bound.isRef(tparam)) false
20532053
else
2054-
ctx.gadt.rollbackGadtUnless(gadtAddBound(tparam, bound, isUpper))
2054+
ctx.gadtState.rollbackGadtUnless(gadtAddBound(tparam, bound, isUpper))
20552055
}
20562056
}
20572057

‎compiler/src/dotty/tools/dotc/core/TypeOps.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,8 @@ object TypeOps:
687687
val bound1 = massage(bound)
688688
if (bound1 ne bound) {
689689
if (checkCtx eq ctx) checkCtx = ctx.fresh.setFreshGADTBounds
690-
if (!checkCtx.gadt.contains(sym)) checkCtx.gadt.addToConstraint(sym)
691-
checkCtx.gadt.addBound(sym, bound1, fromBelow)
690+
if (!checkCtx.gadt.contains(sym)) checkCtx.gadtState.addToConstraint(sym)
691+
checkCtx.gadtState.addBound(sym, bound1, fromBelow)
692692
typr.println("install GADT bound $bound1 for when checking F-bounded $sym")
693693
}
694694
}
@@ -872,7 +872,7 @@ object TypeOps:
872872
case tp: TypeRef if tp.symbol.exists && !tp.symbol.isClass => foldOver(tp.symbol :: xs, tp)
873873
case tp => foldOver(xs, tp)
874874
val syms2 = getAbstractSymbols(Nil, tp2).reverse
875-
if syms2.nonEmpty then ctx.gadt.addToConstraint(syms2)
875+
if syms2.nonEmpty then ctx.gadtState.addToConstraint(syms2)
876876

877877
// If parent contains a reference to an abstract type, then we should
878878
// refine subtype checking to eliminate abstract types according to

‎compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,11 @@ class InlineReducer(inliner: Inliner)(using Context):
311311
def addTypeBindings(typeBinds: TypeBindsMap)(using Context): Unit =
312312
typeBinds.foreachBinding { case (sym, shouldBeMinimized) =>
313313
newTypeBinding(sym,
314-
ctx.gadt.approximation(sym, fromBelow = shouldBeMinimized, maxLevel = Int.MaxValue))
314+
ctx.gadtState.approximation(sym, fromBelow = shouldBeMinimized, maxLevel = Int.MaxValue))
315315
}
316316

317317
def registerAsGadtSyms(typeBinds: TypeBindsMap)(using Context): Unit =
318-
if (typeBinds.size > 0) ctx.gadt.addToConstraint(typeBinds.keys)
318+
if (typeBinds.size > 0) ctx.gadtState.addToConstraint(typeBinds.keys)
319319

320320
pat match {
321321
case Typed(pat1, tpt) =>

‎compiler/src/dotty/tools/dotc/transform/PostTyper.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
269269
case CaseDef(pat, _, _) =>
270270
val gadtCtx =
271271
pat.removeAttachment(typer.Typer.InferredGadtConstraints) match
272-
case Some(gadt) => ctx.fresh.setGadt(GadtConstraintHandling(gadt))
272+
case Some(gadt) => ctx.fresh.setGadtState(GadtState(gadt))
273273
case None =>
274274
ctx
275275
super.transform(tree)(using gadtCtx)

‎compiler/src/dotty/tools/dotc/typer/Implicits.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,8 +1030,8 @@ trait Implicits:
10301030
case result: SearchSuccess =>
10311031
if result.tstate ne ctx.typerState then
10321032
result.tstate.commit()
1033-
if result.gstate ne ctx.gadt.gadt then
1034-
ctx.gadt.restore(result.gstate)
1033+
if result.gstate ne ctx.gadt then
1034+
ctx.gadtState.restore(result.gstate)
10351035
if hasSkolem(false, result.tree) then
10361036
report.error(SkolemInInferred(result.tree, pt, argument), ctx.source.atSpan(span))
10371037
implicits.println(i"success: $result")
@@ -1145,7 +1145,7 @@ trait Implicits:
11451145
SearchFailure(adapted.withType(new MismatchedImplicit(ref, pt, argument)))
11461146
}
11471147
else
1148-
SearchSuccess(adapted, ref, cand.level, cand.isExtension)(ctx.typerState, ctx.gadt.gadt)
1148+
SearchSuccess(adapted, ref, cand.level, cand.isExtension)(ctx.typerState, ctx.gadt)
11491149
}
11501150

11511151
/** An implicit search; parameters as in `inferImplicit` */
@@ -1343,7 +1343,7 @@ trait Implicits:
13431343
case _: SearchFailure =>
13441344
SearchSuccess(ref(defn.NotGiven_value), defn.NotGiven_value.termRef, 0)(
13451345
ctx.typerState.fresh().setCommittable(true),
1346-
ctx.gadt.gadt
1346+
ctx.gadt
13471347
)
13481348
case _: SearchSuccess =>
13491349
NoMatchingImplicitsFailure
@@ -1526,7 +1526,7 @@ trait Implicits:
15261526
// other candidates need to be considered.
15271527
recursiveRef match
15281528
case ref: TermRef =>
1529-
SearchSuccess(tpd.ref(ref).withSpan(span.startPos), ref, 0)(ctx.typerState, ctx.gadt.gadt)
1529+
SearchSuccess(tpd.ref(ref).withSpan(span.startPos), ref, 0)(ctx.typerState, ctx.gadt)
15301530
case _ =>
15311531
searchImplicit(contextual = true)
15321532
end bestImplicit

0 commit comments

Comments
 (0)