Don't lose track of imports in presentation compiler #5987
Merged
Conversation
This file contains 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
Fixes regression in that the reporter bisected to scala#4079. I haven't reverted that change, but rather noticed that the path through namers that enters trees that already have symbols assigned was not extending the context chain for imports.
lrytz
approved these changes
Jul 10, 2017
xeno-by
reviewed
Jul 10, 2017
| case sym => enterExistingSym(sym, tree) | ||
| case sym => | ||
| tree match { | ||
| case tree@Import(_, _) => enterExistingSym(sym, tree).make(tree) |
There was a problem hiding this comment.
Why wasn't this leading to problems in the batch compiler?
There was a problem hiding this comment.
I think tree.symbol is null, at least for imports, at this point in the batch compiler, which goes to the code just above in dispatch().
case tree @ Import(_, _) => enterImport(tree); returnContext = context.make(tree)
I'll test that theory out by adding some assertions before I merge, won't have time for a few days though.
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.
Fixes regression in that the reporter bisected to #4079.
I haven't reverted that change, but rather noticed that
the path through namers that enters trees that already
have symbols assigned was not extending the context chain
for imports.
Fixes scala/bug#9283