Skip to content
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

Jump to bottom

Backport "Avoid bidirectional GADT typebounds from fullBounds" #16945

Merged
merged 7 commits into from
Feb 17, 2023
Merged

Backport "Avoid bidirectional GADT typebounds from fullBounds" #16945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92c5dad
Split out immutable GadtConstraint
dwijnand Dec 30, 2022
58d0a29
Rename GadtConstraintHandling to GadtState
dwijnand Jan 24, 2023
abbb549
Avoid bidirectional GADT typebounds from fullBounds
dwijnand Feb 13, 2023
6d141f3
Drop failsafe checkNonCyclic and document GADT fullBounds change
dwijnand Feb 14, 2023
4cc0e0d
GADT: move dropping GADT symbols into foldLeft
dwijnand Feb 15, 2023
5453d5c
GADT: Use isPatternBound, ofc...
dwijnand Feb 15, 2023
ace96f7
GADT: Use =:= instead of Any/Nothing
dwijnand Feb 15, 2023
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
3 changes: 3 additions & 0 deletions compiler/src/dotty/tools/dotc/core/Constraint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ abstract class Constraint extends Showable {
*/
def nonParamBounds(param: TypeParamRef)(using Context): TypeBounds

/** The current bounds of type parameter `param` */
def bounds(param: TypeParamRef)(using Context): TypeBounds

/** A new constraint which is derived from this constraint by adding
* entries for all type parameters of `poly`.
* @param tvars A list of type variables associated with the params,
Expand Down
11 changes: 1 addition & 10 deletions compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,16 +749,7 @@ trait ConstraintHandling {
}

/** The current bounds of type parameter `param` */
def bounds(param: TypeParamRef)(using Context): TypeBounds = {
val e = constraint.entry(param)
if (e.exists) e.bounds
else {
// TODO: should we change the type of paramInfos to nullable?
val pinfos: List[param.binder.PInfo] | Null = param.binder.paramInfos
if (pinfos != null) pinfos(param.paramNum) // pinfos == null happens in pos/i536.scala
else TypeBounds.empty
}
}
def bounds(param: TypeParamRef)(using Context): TypeBounds = constraint.bounds(param)

/** Add type lambda `tl`, possibly with type variables `tvars`, to current constraint
* and propagate all bounds.
Expand Down
21 changes: 11 additions & 10 deletions compiler/src/dotty/tools/dotc/core/Contexts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ object Contexts {
def tree: Tree[?]
def scope: Scope
def typerState: TyperState
def gadt: GadtConstraint
def gadt: GadtConstraint = gadtState.gadt
def gadtState: GadtState
def searchHistory: SearchHistory
def source: SourceFile

Expand Down Expand Up @@ -410,7 +411,7 @@ object Contexts {
val constrCtx = outersIterator.dropWhile(_.outer.owner == owner).next()
superOrThisCallContext(owner, constrCtx.scope)
.setTyperState(typerState)
.setGadt(gadt)
.setGadtState(gadtState)
.fresh
.setScope(this.scope)
}
Expand Down Expand Up @@ -541,8 +542,8 @@ object Contexts {
private var _typerState: TyperState = uninitialized
final def typerState: TyperState = _typerState

private var _gadt: GadtConstraint = uninitialized
final def gadt: GadtConstraint = _gadt
private var _gadtState: GadtState = uninitialized
final def gadtState: GadtState = _gadtState

private var _searchHistory: SearchHistory = uninitialized
final def searchHistory: SearchHistory = _searchHistory
Expand All @@ -567,7 +568,7 @@ object Contexts {
_owner = origin.owner
_tree = origin.tree
_scope = origin.scope
_gadt = origin.gadt
_gadtState = origin.gadtState
_searchHistory = origin.searchHistory
_source = origin.source
_moreProperties = origin.moreProperties
Expand Down Expand Up @@ -624,12 +625,12 @@ object Contexts {
this._scope = typer.scope
setTypeAssigner(typer)

def setGadt(gadt: GadtConstraint): this.type =
util.Stats.record("Context.setGadt")
this._gadt = gadt
def setGadtState(gadtState: GadtState): this.type =
util.Stats.record("Context.setGadtState")
this._gadtState = gadtState
this
def setFreshGADTBounds: this.type =
setGadt(gadt.fresh)
setGadtState(gadtState.fresh)

def setSearchHistory(searchHistory: SearchHistory): this.type =
util.Stats.record("Context.setSearchHistory")
Expand Down Expand Up @@ -721,7 +722,7 @@ object Contexts {
.updated(notNullInfosLoc, Nil)
.updated(compilationUnitLoc, NoCompilationUnit)
c._searchHistory = new SearchRoot
c._gadt = GadtConstraint.empty
c._gadtState = GadtState(GadtConstraint.empty)
c
end FreshContext

Expand Down
Loading