pyos
4fc1bd9ec5
Namely, anonymous objects defined in lambdas that have all captured
variables as loose fields instead of a single reference to the parent.
The question is, when a lambda inside an inline function defines an
anonymous object, and that object is not regenerated during codegen for
the inline function itself, but then has to be regenerated at call site
anyway, do we use an outer `this` or loose capture fields? For example,
before KT-28064:
inline fun f1(g: () -> Unit) = object { g() }
// -> f1$1 { $g: () -> Unit }
inline fun f2(g: () -> Unit) = f1 { object { g() } }
// -> f2$$inlined$f1$1 { $g: () -> Unit }
// f2$$inlined$f1$1$lambda$1 { this$0: f2$$inlined$f1$1 }
inline fun f3(g: () -> Unit) = f2 { object { g() } }
// -> f3$$inlined$f2$1 { $g: () -> Unit }
// f3$$inlined$f2$1$1 { this$0: f3$$inlined$f2$1 }
// f3$$inlined$f2$1$1$lambda$1 { this$0: f3$$inlined$f2$1$1 }
After KT-28064:
inline fun f2(g: () -> Unit) = f1 { object { g() } }
// -> f2$$inlined$f1$1 { $g: () -> Unit }
// f2$1$1 { $g: () -> Unit }
inline fun f3(g: () -> Unit) = f2 { object { g() } }
// -> f3$$inlined$f2$1 { $g: () -> Unit }
// f3$$inlined$f2$2 { ??? }
// f3$1$1 { $g: () -> Unit }
Should `???` be `this$0: f3$$inlined$f2$1` or `$g: () -> Unit`? This
commit chooses the latter for KT-28064 bytecode and keeps `this$0` when
inlining the old bytecode.
53 lines
1.2 KiB
Kotlin
Vendored
53 lines
1.2 KiB
Kotlin
Vendored
// TARGET_BACKEND: JVM
|
|
// FILE: 1.kt
|
|
// WITH_REFLECT
|
|
package test
|
|
|
|
interface Z<T> {
|
|
fun a() : T
|
|
}
|
|
|
|
inline fun test(crossinline z: () -> String) =
|
|
object : Z<Z<String>> {
|
|
|
|
val p: Z<String> = object : Z<String> {
|
|
|
|
val p2 = z()
|
|
|
|
override fun a() = p2
|
|
}
|
|
|
|
override fun a() = p
|
|
}
|
|
|
|
// FILE: 2.kt
|
|
|
|
import test.*
|
|
|
|
fun box(): String {
|
|
var z = "OK"
|
|
val res = test {
|
|
z
|
|
}
|
|
|
|
|
|
val javaClass1 = res.javaClass
|
|
val enclosingMethod = javaClass1.enclosingMethod
|
|
if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}"
|
|
|
|
val enclosingClass = javaClass1.enclosingClass
|
|
if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}"
|
|
|
|
|
|
val res2 = res.a()
|
|
val enclosingConstructor = res2.javaClass.enclosingConstructor
|
|
if (enclosingConstructor?.name != javaClass1.name) return "fail 3: ${enclosingConstructor?.name} != ${javaClass1.name}"
|
|
|
|
val enclosingClass2 = res2.javaClass.enclosingClass
|
|
if (enclosingClass2?.name != javaClass1.name) return "fail 4: ${enclosingClass2?.name} != ${javaClass1.name}"
|
|
|
|
|
|
|
|
return res2.a()
|
|
}
|