Avoid cycles when unpickling the stdlib from TASTY #5901
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
odersky
approved these changes
Feb 12, 2019
compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
Outdated
Show resolved
Hide resolved
`adjustForTuple` shouldn't be used when unpickling Java (because the Tuple classes are always defined in .scala files) nor when unpickling TASTY (because at that point, `adjustForTuple` has already been called by Namer before pickling). This avoids some cycles when unpickling the standard library from TASTY (we don't have a published Dotty-compiled standard library yet, but trying to use incremental compilation in the stdlib that is part of our community build is enough to trigger the issue). Note: This won't handle the hypothetical future case of Scala 2 generated TASTY files which wouldn't have the extra parents, but let's not worry about that for now.
smarter
force-pushed
the
stdlib-tasty
branch
from
5816453 to
2c25b88
Compare
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.
adjustForTupleshouldn't be used when unpickling Java (because theTuple classes are always defined in .scala files) nor when unpickling
TASTY (because at that point,
adjustForTuplehas already been calledby Namer before pickling). This avoids some cycles when unpickling
the standard library from TASTY (we don't have a published
Dotty-compiled standard library yet, but trying to use incremental
compilation in the stdlib that is part of our community build is enough
to trigger the issue).
Note: This won't handle the hypothetical future case of Scala 2
generated TASTY files which wouldn't have the extra parents, but let's not
worry about that for now.