JVM IR: change generation scheme of property $delegate methods

Generate $delegate method as instance method in
PropertyReferenceDelegationLowering, and remove dispatch receiver later
in MakePropertyDelegateMethodsStatic. The method needs to be static to
be non-overridable (see delegateMethodIsNonOverridable.kt), and public
to be accessible in reflection.

Otherwise we generated incorrect IR where a static function accessed an
instance field of the containing class, which failed in multiple places
including LocalDeclarationsLowering.

 #KT-48350 Fixed
This commit is contained in:
Alexander Udalov
2021-08-21 02:38:11 +02:00
committed by Alexander Udalov
parent 50508da156
commit 04c5bbdcf8
25 changed files with 565 additions and 48 deletions
@@ -0,0 +1,34 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
import kotlin.reflect.*
import kotlin.reflect.jvm.isAccessible
val a = 1
val b = 2
fun KProperty0<*>.test(): String =
(apply { isAccessible = true }.getDelegate() as KProperty<*>).name
open class C {
open val x by run { ::a }
open val y by ::a
val xc = ::x.test()
val yc = ::y.test()
}
class D : C() {
override val x by run { ::b }
override val y by ::b
val xd = ::x.test()
val yd = ::y.test()
}
fun box(): String {
val result = D().run { "$xc $yc $xd $yd" }
if (result != "a a b b") return "Fail: $result"
return "OK"
}
@@ -0,0 +1,63 @@
// WITH_REFLECT
// TARGET_BACKEND: JVM
import kotlin.reflect.*
import kotlin.reflect.jvm.isAccessible
import kotlin.reflect.full.getExtensionDelegate
class C(var x: Int) {
var y by C::x
var z by ::x
}
class D(val c: C) {
var y by c::x
var C.w by C::x
var Int.q by Int::x
}
var x = 1
var y by ::x
var z by C(1)::x
var _x = -99
var Int.x
get() = this + _x
set(v: Int) { _x = v - this }
var Int.y by Int::x
inline fun <P : KProperty<*>, R> P.test(delegate: P.() -> R, get: R.() -> Int, set: R.(Int) -> Unit) {
val ref = apply { isAccessible = true }.delegate()
require(ref.get() == 1) { "$ref initial value is ${ref.get()}, not 1" }
ref.set(2)
require(ref.get() == 2) { "$ref after set(2) is ${ref.get()}, not 2" }
ref.set(1)
}
fun KMutableProperty0<Int>.test() =
test({ getDelegate() as KMutableProperty0<Int> }, { get() }, { set(it) })
fun <T> KMutableProperty1<T, Int>.test(receiver: T) =
test({ getDelegate(receiver) as KMutableProperty0<Int> }, { get() }, { set(it) })
fun <T> KMutableProperty1<T, Int>.test(receiver: T, receiver2: T) =
test({ getDelegate(receiver) as KMutableProperty1<T, Int> }, { get(receiver2) }, { set(receiver2, it) })
fun <R1, R2> KMutableProperty2<R1, R2, Int>.test(receiver1: R1, receiver2: R2) =
test({ getDelegate(receiver1, receiver2) as KMutableProperty1<R2, Int> }, { get(receiver2) }, { set(receiver2, it) })
fun box(): String {
C::y.test(C(100), C(1))
C::z.test(C(1))
D::y.test(D(C(1)))
::y.test()
::z.test()
Int::y.test({ getExtensionDelegate() as KMutableProperty1<Int, Int> }, { get(100) }, { set(100, it) })
val w = D::class.members.single { it.name == "w" } as KMutableProperty2<D, C, Int>
w.test(D(C(100)), C(1))
val q = D::class.members.single { it.name == "q" } as KMutableProperty2<D, Int, Int>
q.test({ getExtensionDelegate(D(C(100))) as KMutableProperty1<Int, Int> }, { get(100) }, { set(100, it) })
return "OK"
}