Use nearest Java super qualifier for fields in IR converter
Related to KT-49507
This commit is contained in:
@@ -16,8 +16,18 @@ open class Kotlin2 : Java2() {
|
||||
|
||||
fun test1(j: Kotlin2) = j.f
|
||||
|
||||
// JVM_IR_TEMPLATES
|
||||
// @Kotlin2.class:
|
||||
// 2 GETFIELD Java2.f : I
|
||||
|
||||
// JVM_IR_TEMPLATES
|
||||
// @TestKt.class:
|
||||
// 2 GETFIELD Java2.f : I
|
||||
|
||||
// JVM_TEMPLATES
|
||||
// @Kotlin2.class:
|
||||
// 1 GETFIELD Java2.f : I
|
||||
|
||||
// JVM_TEMPLATES
|
||||
// @TestKt.class:
|
||||
// 1 GETFIELD Java2.f : I
|
||||
@@ -13,7 +13,7 @@ class C : B {
|
||||
|
||||
fun f(): @FlexibleNullability String? {
|
||||
return eval<@FlexibleNullability String?>(f = local fun <anonymous>(): @FlexibleNullability String? {
|
||||
return <this>(super<A>).#x
|
||||
return <this>(super<B>).#x
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ class C : B {
|
||||
|
||||
fun f(): @FlexibleNullability String? {
|
||||
return eval<@FlexibleNullability String?>(f = local fun <anonymous>(): @FlexibleNullability String? {
|
||||
return <this>(super<A>).#x
|
||||
return <this>(super<B>).#x
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
fun foo(movedPaths: MutableList<Couple<FilePath>>) {
|
||||
movedPaths.forEach<Couple<FilePath>>(action = local fun <anonymous>(it: Couple<FilePath>) {
|
||||
it(super<Pair>).#second.getName() /*~> Unit */
|
||||
it(super<Couple>).#second.getName() /*~> Unit */
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
fun foo(movedPaths: MutableList<Couple<FilePath>>) {
|
||||
movedPaths.forEach<Couple<FilePath>>(action = local fun <anonymous>(it: Couple<FilePath>) {
|
||||
it(super<Pair>).#second /*!! FilePath */.getName() /*~> Unit */
|
||||
it(super<Couple>).#second /*!! FilePath */.getName() /*~> Unit */
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user