Skip to content

Don't lose info in bounds when pruning #8828

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 22 commits into from
May 7, 2020
Merged

Don't lose info in bounds when pruning #8828

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c657700
Don't lose info in bounds when pruning
odersky Apr 29, 2020
aca3133
Simplify prune
odersky Apr 29, 2020
94f3f0c
Simplify some more
odersky Apr 29, 2020
247cc86
Rearrange parts of ConstraintHandling for legibility
odersky Apr 29, 2020
14689bf
Avoid cycles when adding bounds to constraints
odersky Apr 29, 2020
f876537
Disable three scalatest tests
odersky Apr 29, 2020
bf55005
Integrate prune logic in addOneBound
odersky Apr 29, 2020
788be02
Drop redundant Config option
odersky Apr 29, 2020
74d81ab
Drop redundant code
odersky Apr 29, 2020
c58b23f
Fix adjust
odersky Apr 29, 2020
9ebdac4
Improve handling of printing unique ids on debug
odersky Apr 30, 2020
462279c
Refactor OrderingConstraint
odersky Apr 30, 2020
5a57ae5
Simplify adjust
odersky Apr 30, 2020
677ae31
Include TypeVars in cyclic checking
odersky Apr 30, 2020
498578e
Revert "Disable three scalatest tests"
odersky Apr 30, 2020
16dec6b
Check for cyclic constraints
odersky Apr 30, 2020
3386185
Revert "Check for cyclic constraints"
odersky Apr 30, 2020
fa8e36b
Change top type to AnyKind
odersky Apr 30, 2020
f4cbf5d
Make cycle checking complete
odersky May 1, 2020
f4de03f
Check for cyclic constraints
odersky Apr 30, 2020
0e4adb8
Simplify constraint handling
odersky May 1, 2020
031c69a
Revert "Check for cyclic constraints"
odersky Apr 30, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Include TypeVars in cyclic checking 
Without the additional case, scalatest fails.
  • Loading branch information
@odersky
odersky committed Apr 30, 2020
commit 677ae31ef48bcf596e93fb58e7b8f02c2e532916
8 changes: 5 additions & 3 deletions compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
case NoType => tp
case TypeBounds(lo, hi) => if lo eq hi then recur(lo, fromBelow) else tp
case inst => recur(inst, fromBelow)
case tp: TypeVar if false => // TODO: needed?
case tp: TypeVar =>
val underlying1 = recur(tp.underlying, fromBelow)
if underlying1 ne tp.underlying then underlying1 else tp
case _ => tp
Expand Down Expand Up @@ -399,7 +399,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
*/
def replace(param: TypeParamRef, tp: Type)(implicit ctx: Context): OrderingConstraint =
val replacement = tp.dealiasKeepAnnots.stripTypeVar
if param == replacement then this
if param == replacement then this.checkNonCyclic()
else
assert(replacement.isValueTypeOrLambda)
var current =
Expand Down Expand Up @@ -518,7 +518,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
val TypeParamRef(binder, n) = tvar.origin
if (binder eq tl) tvar.setOrigin(tl1.paramRefs(n))
}
constr.println(i"renamd $this to $current")
constr.println(i"renamed $this to $current")
current.checkNonCyclic()
}

Expand Down Expand Up @@ -602,6 +602,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
case NoType =>
case TypeBounds(lo, hi) => if lo eq hi then recur(lo)
case inst => recur(inst)
case tp: TypeVar =>
recur(tp.underlying)
case TypeBounds(lo, hi) =>
recur(lo)
recur(hi)
Expand Down