Fix reification for crossinline lambdas inlined into object literal
Inline lambda could capture reified parameter of containing inline function ('a' function)
when it is inlined in another one.
If it's inlined in any anonymous object we should track it and
add reification marker to such anonymous object instance creation
to rewrite it on inlining bytecode of 'a' function.
#KT-15997 Fixed
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
// FILE: 1.kt
|
||||
// FULL_JDK
|
||||
// WITH_REFLECT
|
||||
package test
|
||||
|
||||
import kotlin.properties.Delegates
|
||||
import kotlin.properties.ReadWriteProperty
|
||||
|
||||
var result = "fail"
|
||||
|
||||
inline fun <reified T : Any> crashMe(): ReadWriteProperty<Any?, Unit> {
|
||||
return Delegates.observable(Unit, { a, b, c -> result = T::class.java.simpleName })
|
||||
}
|
||||
|
||||
|
||||
// FILE: 2.kt
|
||||
import test.*
|
||||
|
||||
|
||||
class OK {
|
||||
var value by crashMe<OK>()
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
OK().value = Unit
|
||||
return result
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
// FILE: 1.kt
|
||||
// FULL_JDK
|
||||
// WITH_REFLECT
|
||||
package test
|
||||
|
||||
import kotlin.properties.Delegates
|
||||
import kotlin.properties.ReadWriteProperty
|
||||
import kotlin.properties.ObservableProperty
|
||||
import kotlin.reflect.KProperty
|
||||
|
||||
var result = "fail"
|
||||
|
||||
public inline fun <reified T> myObservable(initialValue: T, crossinline onChange: (property: KProperty<*>, oldValue: T, newValue: T) -> Unit):
|
||||
ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
|
||||
override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) = onChange(property, oldValue, newValue)
|
||||
}
|
||||
|
||||
|
||||
//samely named reified parameter (T) as in myObservable
|
||||
inline fun <reified T : Any> crashMe(): ReadWriteProperty<Any?, Unit> {
|
||||
return myObservable(Unit, { a, b, c -> result = T::class.java.simpleName })
|
||||
}
|
||||
|
||||
|
||||
// FILE: 2.kt
|
||||
import test.*
|
||||
|
||||
|
||||
class OK {
|
||||
var value by crashMe<OK>()
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
OK().value = Unit
|
||||
return result
|
||||
}
|
||||
Reference in New Issue
Block a user