Fix #3638: Fix protected setter generation #3715
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
changed the title
smarter
approved these changes
Dec 31, 2017
| @@ -0,0 +1,12 @@ | |||
| package p { | |||
| package a { | |||
| class JavaInteraction(arr: Array[Char]) | |||
There was a problem hiding this comment.
It looks like this test was minimized from https://github.com/scala/scala/blob/2.13.x/test/files/jvm/protectedacc.scala, it might be worthwhile to port over the whole test (I think it's a run test but it's in /jvm and not /run so it might need to be run in a special way?).
There was a problem hiding this comment.
I think it can't run on JS because it uses Java classes, that's why it's in jvm. I added the full test to run.
|
@nicolasstucki The FromTasty test fails on protectedacc.scala. Can you take a look to find out what's wrong? |
|
I will have a look |
|
I minimized that issue to package a {
class PolyA {
protected def m(): Unit = ()
}
}
class X extends a.PolyA {
trait Inner {
m()
}
}which can be reproduced with and fails with |
|
The failure is after |
|
The bug in |
The previous logic made a super accessor private if it is put in a class (on behalf of a nested trait). This caused compilation from Tasty to fail, since at the point of Tasty generation the RHS of the accessor has not yet been generated (it will be generated later in resolveSuper), and therefore Unpickler concluded that the method is private and deferred, which is illegal. Making it private is anyway pointless, since the super accessor is referred to from an inner trait (that's why it was generated in the first place!) and therefore will be made non-private later on.
| @@ -80,10 +80,10 @@ class SuperAccessors(thisPhase: DenotTransformer) { | |||
| val superAcc = clazz.info.decl(superName) | |||
| .suchThat(_.signature == superInfo.signature).symbol | |||
| .orElse { | |||
| ctx.debuglog(s"add super acc ${sym.showLocated} to $clazz") | |||
| val deferredOrPrivate = if (clazz is Trait) Deferred else Private | |||
| ctx.debugLog(s"add super acc ${sym.showLocated} to $clazz") | |||
There was a problem hiding this comment.
ctx.debugLog -> ctx.debuglog
There was a problem hiding this comment.
This commit should also Fix #3738
|
Otherwise LGTM |
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.