Fix #3538: Better invalidation of typed arguments in FunProtos #3661
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
One scenario we overlooked was that an argument in a FunProto might have been computed in a context that was subsequently retracted from its typerstate (e.g. because an enclosing subtype test failed). In that case we need to re-evaluate the argument in order to avoid orphan typerefs.
smarter
approved these changes
Dec 13, 2017
| @@ -570,6 +570,14 @@ class OrderingConstraint(private val boundsMap: ParamBounds, | |||
| private def checkNonCyclic(param: TypeParamRef)(implicit ctx: Context): Unit = | |||
| assert(!isLess(param, param), i"cyclic constraint involving $param in $this") | |||
|
|
|||
| // ---------- Invalidation ------------------------------------------- | |||
|
|
|||
| private var retracted = false | |||
| @@ -33,6 +33,12 @@ class TyperState(previous: TyperState /* | Null */) extends DotClass with Showab | |||
| myConstraint = c | |||
| } | |||
|
|
|||
| /** Reset constraint to `c` and mark current constraint as retracted if it differs from `c` */ | |||
| def resetConstraintTo(c: Constraint) = { | |||
| if (c `ne` myConstraint) myConstraint.markRetracted() | |||
There was a problem hiding this comment.
Why use backquotes around ne ? New coding style for infix calls?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One scenario we overlooked was that an argument in a FunProto might have been
computed in a context that was subsequently retracted from its typerstate (e.g.
because an enclosing subtype test failed). In that case we need to re-evaluate
the argument in order to avoid orphan typerefs.