FIR: Handle visibility of public setter of protected synthetic property like in K1
K1 allows writing access to a public setter of a protected synthetic property only if the call is inside a subclass. K2 previously allowed that unconditionally. This changes brings the behavior in line with K1. ^KT-56050 Fixed
This commit is contained in:
committed by
Space Team
parent
1990883bdc
commit
f6c189be7b
+94
-4
@@ -1,9 +1,9 @@
|
||||
// FILE: j/Super.java
|
||||
package j
|
||||
|
||||
public abstract class Super {
|
||||
protected abstract String getName();
|
||||
public abstract void setName(String s);
|
||||
public class Super {
|
||||
protected String getName() { return "" };
|
||||
public void setName(String s) { }
|
||||
}
|
||||
|
||||
// FILE: k/test.kt
|
||||
@@ -11,13 +11,103 @@ public abstract class Super {
|
||||
package k
|
||||
import j.Super
|
||||
|
||||
abstract class Sub: Super() {
|
||||
abstract class Sub : Super() {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
|
||||
val anon1 = object : Super() {
|
||||
fun testAnon() {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
|
||||
val anon2 = object {
|
||||
fun testAnon() {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inner class Nested1 : Super() {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
|
||||
class Nested2 {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
abstract class NonSub {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = ""
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
|
||||
val anon1 = object : Super() {
|
||||
fun testAnon() {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
|
||||
val anon2 = object {
|
||||
fun testAnon() {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = ""
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inner class Nested1 : Super() {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.name = ""
|
||||
s.name = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
|
||||
class Nested2 {
|
||||
fun test(s: Super) {
|
||||
s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.<!INVISIBLE_MEMBER!>getName<!>()
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = ""
|
||||
s.<!INVISIBLE_MEMBER!>name<!> = s.<!INVISIBLE_MEMBER!>name<!>
|
||||
s.setName("")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user