Add missing phase travel when searching a companion in the backend#5976
Merged
retronym merged 1 commit intoscala:2.12.xfrom Jul 7, 2017
Merged
Add missing phase travel when searching a companion in the backend#5976retronym merged 1 commit intoscala:2.12.xfrom
retronym merged 1 commit intoscala:2.12.xfrom
Conversation
When looking for the companion of a nested class A$C in the backend, a pahse travel is necessary to avoid finding the package-owned symbol for A$C.class (created by SymbolLoaders) instead of the symbol C owned by A. BTypesFromSymbols contains many such phase travels already, this fixes a missing case. Fixes scala/scala-dev#402
Member
|
Huh. Is it also what we should be doing in Scala.js instead of our |
Member
Author
|
That sounds plausible, give it a try! |
retronym
reviewed
Jul 6, 2017
| // is compiled from source, this ensures that `companionModule` doesn't return the `A$B` | ||
| // symbol created for the `A$B.class` file on the classpath, which might be different. | ||
| val companion = exitingPickler(classSym.companionModule) | ||
| val staticMethods = companion.info.decls.iterator.filter(m => !m.isConstructor && keepMember(m)) |
Member
There was a problem hiding this comment.
I took a quick look to see why the flatten info transformer doesn't move the module symbol into the package scope. This !sym.isStaticModule check seems to be related.
retronym
approved these changes
Jul 6, 2017
Member
retronym
left a comment
There was a problem hiding this comment.
LGTM, this fix follows the prevailing pattern in the backend.
Member
Thanks, I will. scala-js/scala-js#3042 |
Member
|
Logging the idea to fix this in |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
When looking for the companion of a nested class A$C in the backend, a
pahse travel is necessary to avoid finding the package-owned symbol for
A$C.class (created by SymbolLoaders) instead of the symbol C owned by A.
BTypesFromSymbols contains many such phase travels already, this fixes
a missing case.
Fixes scala/scala-dev#402