azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM_IR no static inline class members for Kotlin JvmDefault methods

Browse Source 
KT-43698 KT-43051
This commit is contained in:
Dmitry Petrov
2020-12-02 14:58:05 +03:00
parent 11673bd09c
commit e6a3e38c4d
29 changed files with 1044 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/javaDefaultMethod.kt
Vendored
+38
View File
@@ -0,0 +1,38 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// JVM_TARGET: 1.8
// FILE: javaDefaultMethod.kt
inline class K(val k: String) : J {
override fun get2() = k
}
fun box(): String {
val k = K("K")
val test1 = k.get1() + k.get2()
if (test1 != "OK") throw AssertionError("test1: $test1")
val j: J = k
val test2 = j.get1() + j.get2()
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = JT.test(k)
if (test3 != "OK") throw AssertionError("test3: $test3")
return "OK"
}
// FILE: J.java
public interface J {
default String get1() { return "O"; }
default String get2() { return "Failed"; }
}
// FILE: JT.java
public class JT {
public static String test(J j) {
return j.get1() + j.get2();
}
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/javaDefaultMethodOverriddenByKotlin.kt
Vendored
+49
View File
@@ -0,0 +1,49 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// JVM_TARGET: 1.8
// FILE: javaDefaultMethod.kt
interface K2 : J {
override fun get2() = "Kotlin"
}
inline class K(val k: String) : K2 {
override fun get2() = k
}
fun box(): String {
val k = K("K")
val test1 = k.get1() + k.get2()
if (test1 != "OK") throw AssertionError("test1: $test1")
val j: J = k
val test2 = j.get1() + j.get2()
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = JT.test(k)
if (test3 != "OK") throw AssertionError("test3: $test3")
val k2: K2 = k
val test4 = k2.get1() + k2.get2()
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = JT.test(k2)
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
// FILE: J.java
public interface J {
default String get1() { return "O"; }
default String get2() { return "Java"; }
}
// FILE: JT.java
public class JT {
public static String test(J j) {
return j.get1() + j.get2();
}
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAll.kt
Vendored
+48
View File
@@ -0,0 +1,48 @@
// !JVM_DEFAULT_MODE: all
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultAll.kt
interface IFooBar {
fun foo() = "O"
fun bar() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(val k: String): IFooBar {
override fun bar(): String = k
}
inline class Test2(val k: String): IFooBar2 {
override fun bar(): String = k
}
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo() + k.bar()
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo() + ik.bar()
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo() + k2.bar()
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo() + ik2.bar()
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo() + ik3.bar()
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPrimaryProperty.kt
Vendored
+44
View File
@@ -0,0 +1,44 @@
// !JVM_DEFAULT_MODE: all
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultAll.kt
interface IFooBar {
val foo get() = "O"
val bar get() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(override val bar: String): IFooBar
inline class Test2(override val bar: String): IFooBar2
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo + k.bar
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo + ik.bar
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo + k2.bar
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo + ik2.bar
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo + ik3.bar
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllProperty.kt
Vendored
+50
View File
@@ -0,0 +1,50 @@
// !JVM_DEFAULT_MODE: all
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultAll.kt
interface IFooBar {
val foo get() = "O"
val bar get() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(val k: String): IFooBar {
override val bar: String
get() = k
}
inline class Test2(val k: String): IFooBar2 {
override val bar: String
get() = k
}
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo + k.bar
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo + ik.bar
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo + k2.bar
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo + ik2.bar
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo + ik3.bar
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt
Vendored
+48
View File
@@ -0,0 +1,48 @@
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultEnable.kt
interface IFooBar {
@JvmDefault fun foo() = "O"
@JvmDefault fun bar() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(val k: String): IFooBar {
override fun bar(): String = k
}
inline class Test2(val k: String): IFooBar2 {
override fun bar(): String = k
}
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo() + k.bar()
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo() + ik.bar()
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo() + k2.bar()
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo() + ik2.bar()
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo() + ik3.bar()
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt
Vendored
+44
View File
@@ -0,0 +1,44 @@
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultEnable.kt
interface IFooBar {
@JvmDefault val foo get() = "O"
@JvmDefault val bar get() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(override val bar: String): IFooBar
inline class Test2(override val bar: String): IFooBar2
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo + k.bar
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo + ik.bar
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo + k2.bar
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo + ik2.bar
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo + ik3.bar
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}
compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt
Vendored
+50
View File
@@ -0,0 +1,50 @@
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// IGNORE_BACKEND: JVM
// ^ KT-43698, fixed in JVM_IR
// WITH_RUNTIME
// JVM_TARGET: 1.8
// FILE: jvmDefaultEnable.kt
interface IFooBar {
@JvmDefault val foo get() = "O"
@JvmDefault val bar get() = "Failed"
}
interface IFooBar2 : IFooBar
inline class Test1(val k: String): IFooBar {
override val bar: String
get() = k
}
inline class Test2(val k: String): IFooBar2 {
override val bar: String
get() = k
}
fun box(): String {
val k = Test1("K")
val ik: IFooBar = k
val k2 = Test2("K")
val ik2: IFooBar = k2
val ik3: IFooBar2 = k2
val test1 = k.foo + k.bar
if (test1 != "OK") throw AssertionError("test1: $test1")
val test2 = ik.foo + ik.bar
if (test2 != "OK") throw AssertionError("test2: $test2")
val test3 = k2.foo + k2.bar
if (test3 != "OK") throw AssertionError("test3: $test3")
val test4 = ik2.foo + ik2.bar
if (test4 != "OK") throw AssertionError("test4: $test4")
val test5 = ik3.foo + ik3.bar
if (test5 != "OK") throw AssertionError("test5: $test5")
return "OK"
}