Support compatibility mode for @JvmDefault

2018-05-28 16:16:23 +02:00
parent 9b718e83a9
commit 340920fe38
19 changed files with 435 additions and 15 deletions
@@ -0,0 +1,38 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// FILE: Simple.java
+
+public interface Simple extends KInterface2 {
+    default String test() {
+        return KInterface2.DefaultImpls.test2(this, "OK");
+    }
+}
+
+// FILE: Foo.java
+public class Foo implements Simple {
+
+}
+
+// FILE: main.kt
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface KInterface<T>  {
+    @JvmDefault
+    fun test2(p: T): T {
+        return p
+    }
+}
+
+interface KInterface2 : KInterface<String> {
+
+}
+
+
+fun box(): String {
+
+    val result = Foo().test()
+    if (result != "OK") return "fail 1: ${result}"
+
+    return Foo().test2("OK")
+}
@@ -0,0 +1,36 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// FILE: Simple.java
+
+public interface Simple extends KInterface2 {
+    default String test() {
+        return KInterface2.DefaultImpls.test2(this, "OK");
+    }
+}
+
+// FILE: Foo.java
+public class Foo implements Simple {
+    public String test2(String p) {
+        return "fail";
+    }
+}
+
+// FILE: main.kt
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface KInterface<T>  {
+    @JvmDefault
+    fun test2(p: T): T {
+        return p
+    }
+}
+
+interface KInterface2 : KInterface<String> {
+
+}
+
+
+fun box(): String {
+    return Foo().test()
+}
@@ -0,0 +1,40 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// FILE: Simple.java
+
+public interface Simple extends KInterface3 {
+    default String test() {
+        return KInterface3.DefaultImpls.test2(this, "OK");
+    }
+}
+
+// FILE: Foo.java
+public class Foo implements Simple {
+    public String test2(String p) {
+        return "fail";
+    }
+}
+
+// FILE: main.kt
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface KInterface<T>  {
+    @JvmDefault
+    fun test2(p: T): T {
+        return p
+    }
+}
+
+interface KInterface2 : KInterface<String> {
+
+}
+
+interface KInterface3 : KInterface2 {
+
+}
+
+
+fun box(): String {
+    return Foo().test()
+}
@@ -0,0 +1,22 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+// FULL_JDK
+interface Test {
+    @JvmDefault
+    fun test(s: String ="OK"): String {
+        return s
+    }
+}
+
+class TestClass : Test {
+
+}
+
+fun box(): String {
+    val defaultImpls = java.lang.Class.forName(Test::class.java.canonicalName + "\$DefaultImpls")
+
+    val declaredMethod = defaultImpls.getDeclaredMethod("test\$default", Test::class.java, String::class.java, Int::class.java, Any::class.java)
+    return declaredMethod.invoke(null, TestClass(), null, 1, null) as String
+}
@@ -0,0 +1,37 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// FILE: Simple.java
+
+public interface Simple extends KInterface2 {
+    default String test() {
+        return KInterface2.DefaultImpls.test2(this);
+    }
+}
+
+// FILE: Foo.java
+public class Foo implements Simple {
+
+}
+
+// FILE: main.kt
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface KInterface  {
+    @JvmDefault
+    fun test2(): String {
+        return "OK"
+    }
+}
+
+interface KInterface2 : KInterface {
+
+}
+
+
+fun box(): String {
+    val result = Foo().test()
+    if (result != "OK") return "fail 1: ${result}"
+
+    return Foo().test2()
+}
@@ -0,0 +1,33 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// FILE: Simple.java
+
+public interface Simple extends KInterface {
+    default String test() {
+        return KInterface.DefaultImpls.test2(this);
+    }
+}
+
+// FILE: Foo.java
+public class Foo implements Simple {
+
+}
+
+// FILE: main.kt
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+
+interface KInterface  {
+    @JvmDefault
+    fun test2(): String {
+        return "OK"
+    }
+}
+
+
+fun box(): String {
+    val result = Foo().test()
+    if (result != "OK") return "fail 1: ${result}"
+
+    return Foo().test2()
+}
@@ -0,0 +1,20 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+// FULL_JDK
+interface KInterface {
+    @JvmDefault
+    fun test(s: String ="OK"): String {
+        return s
+    }
+}
+
+// 1 INVOKESTATIC KInterface.access\$test\$jd
+// 1 INVOKESTATIC KInterface.test\$default
+
+// from $default
+// 1 INVOKEINTERFACE KInterface.test
+
+//from $jd
+// 1 INVOKESPECIAL KInterface.test
@@ -0,0 +1,20 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// JVM_TARGET: 1.8
+
+interface KInterface  {
+    @JvmDefault
+    fun test2(): String {
+        return "OK"
+    }
+}
+
+interface KInterface2 : KInterface  {
+
+}
+
+// 1 INVOKESTATIC KInterface2.access\$test2\$jd
+// 1 INVOKESTATIC KInterface.access\$test2\$jd
+
+// 1 INVOKESPECIAL KInterface2.test2
+// 1 INVOKESPECIAL KInterface.test2
@@ -0,0 +1,24 @@
+// !API_VERSION: 1.3
+// !JVM_DEFAULT_MODE: compatibility
+// JVM_TARGET: 1.8
+
+interface KInterface  {
+    @JvmDefault
+    fun test2(): String {
+        return "OK"
+    }
+}
+
+interface KInterface2 : KInterface  {
+    @JvmDefault
+    abstract override fun test2(): String
+}
+
+// 1 INVOKESTATIC KInterface.access\$test2\$jd
+// +
+// 0 INVOKESTATIC KInterface2.access\$test2\$jd
+// =
+// 1 INVOKESTATIC
+
+// 1 INVOKESPECIAL KInterface.test2
+// 0 INVOKESPECIAL KInterface2.test2