Skip to content

Fix #3638: Fix protected setter generation #3715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 4, 2018
Merged

Fix #3638: Fix protected setter generation #3715

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
738c172
Fix protected setter generation
odersky Dec 31, 2017
faa0a1b
Add test
odersky Jan 1, 2018
f64ce14
Don't make superAccessors private
odersky Jan 3, 2018
a3c5f12
Fix typo
odersky Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/PostTyper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
super.transform(tree1)
}
case tree @ Assign(sel: Select, _) =>
superAcc.transformAssign(super.transform(tree))
super.transform(superAcc.transformAssign(tree))
case Inlined(call, bindings, expansion) =>
// Leave only a call trace consisting of
// - a reference to the top-level class from which the call was inlined,
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class SuperAccessors(thisPhase: DenotTransformer) {
val accPos = tree.pos.focus
val protectedAccessor = clazz.info.decl(accName).symbol orElse {
val newAcc = ctx.newSymbol(
clazz, accName, Artifact, accType, coord = accPos).enteredAfter(thisPhase)
clazz, accName, Artifact | Method, accType, coord = accPos).enteredAfter(thisPhase)
val code = DefDef(newAcc, vrefss => {
val (receiver :: value :: Nil) :: Nil = vrefss
Assign(receiver.select(field), value).withPos(accPos)
Expand Down
12 changes: 12 additions & 0 deletions tests/pos/i3638.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package p {
package a {
class JavaInteraction(arr: Array[Char])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

extends java.io.CharArrayReader(arr) {
class Inner {
{
count = count
}
}
}
}
}