Duplication of companion methods after using FromTasty fixed #978
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
| @@ -590,7 +590,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) { | |||
| case TYPEDEF | TYPEPARAM => | |||
| if (sym.isClass) { | |||
| val companion = sym.scalacLinkedClass | |||
| if (companion != NoSymbol) { | |||
| if (companion != NoSymbol && symAtAddr.valuesIterator.contains(companion)) { | |||
There was a problem hiding this comment.
why not symAtAddr.contains(companion)?
There was a problem hiding this comment.
@DarkDimius because symAtAddr is a map, key is an address, and to fix the problem we need to see values of this map.
There was a problem hiding this comment.
valuesIterator takes linear time to check if element is contained.
It means that this change makes reading tasty quadratic in number of TypeDefs.
if companion != NoSymbol, where does companion originate from if not from Tasty? ClassPath?
VladimirNik
force-pushed
the
companion-methods-duplication
branch
from
d0d3629 to
62c7458
Compare
VladimirNik
force-pushed
the
companion-methods-duplication
branch
from
62c7458 to
0afb2a3
Compare
|
LGTM |
DarkDimius
added a commit
that referenced
this pull request
Nov 26, 2015
Duplication of companion methods after using FromTasty fixed
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.
Fix for: #977
The problem was due to
scalacLinkedClassmethod invocation during unpickling. Companion methods should be generated only if symbol returned byscalacLinkedClassis among unpickled symbols.Review by @odersky, @DarkDimius