[backport] Fix TyperState assertion failures #12837
Merged
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
The TyperState of `FunProto#protoCtx` might already be committed by the time we call `FunProto#typedArgs` (this can happen for example with the nested TyperState in a `tryEither`), in that case we can trigger assertion errors if we touch that TyperState again. Fixed by using the nearest uncommited ancestor of the capture TyperState instead.
Flushing the reporter can force messages (apparently because of `HideNonSensicalMessages#isHidden`) which can affect the TyperState we're in the process of committing, so make sure that flushing happens before committing to not trigger any assertion. Fixes scala#12736
odersky
approved these changes
Jun 16, 2021
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.
This backports #12827.