Backport "Harden skip in Scanner" to LTS #22136
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
WojciechMazur
force-pushed
the
backport-lts-3.3-21611
branch
from
cc4f5c1 to
8c22acb
Compare
I sometimes see a rogue java process at 100% even after I closed down sbt and vscode.
With jstack I got the following stack trace:
java.lang.Thread.State: RUNNABLE
at dotty.tools.dotc.parsing.Scanners$Scanner.handleNewLine(Scanners.scala:613)
at dotty.tools.dotc.parsing.Scanners$Scanner.nextToken(Scanners.scala:396)
at dotty.tools.dotc.parsing.Scanners$Scanner.skip(Scanners.scala:312)
at dotty.tools.dotc.parsing.Parsers$Parser.skip(Parsers.scala:280)
at dotty.tools.dotc.parsing.Parsers$Parser.recur$2(Parsers.scala:376)
at dotty.tools.dotc.parsing.Parsers$Parser.statSepOrEnd(Parsers.scala:380)
It could be that the loop in skip gives two alternate offsets that would not bump the progress counter.
I changed the loop so that it catches more looping conditions.
[Cherry-picked b1235b9]
WojciechMazur
force-pushed
the
backport-lts-3.3-21607
branch
from
af72f8a to
67b2cec
Compare
|
No regressions detected in the community build up to backport-lts-3.3-21857. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backports #21607 to the 3.3.5.
PR submitted by the release tooling.