sourcepath: Fix handling of top-level definitions and user-written package objects #7690
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
smarter
force-pushed
the
sourcepath-toplevel-again-2
branch
from
8fc3664 to
4a92b5a
Compare
5c2a2d5 was a bit too clever: instead of running the desugaring of top-level definitions, it manually checked if such a desugaring was needed and then entered the package object if needed and traversed the non-desugared package statements, but in a situation like this: package foo type Foo object Foo The desugaring will move `object Foo` inside the package object, so by traversing the non-desugared tree, we were creating a symbol for Foo at the wrong level. This commit fixes this by simply calling the appropriate desugaring method before doing any traversal. Unfortunately I wasn't able to manufacture a testcase where this makes a difference, but this fixes some issues I saw when compiling dotty-library itself.
Turns out we never handled this properly before.
smarter
force-pushed
the
sourcepath-toplevel-again-2
branch
from
4a92b5a to
d4b2222
Compare
odersky
approved these changes
Dec 9, 2019
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.
No description provided.