Generate defaults methods on extending jvm6 interfaces

2016-05-19 14:30:34 +03:00
parent 331341bd4d
commit 16159c483d
7 changed files with 171 additions and 1 deletions
@@ -1321,7 +1321,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
    }

    private void generateTraitMethods() {
-        if (isInterface(descriptor)) return;
+        if (isJvm6Interface(descriptor, state)) return;

        for (Map.Entry<FunctionDescriptor, FunctionDescriptor> entry : CodegenUtil.getNonPrivateTraitMethods(descriptor).entrySet()) {
            FunctionDescriptor traitFun = entry.getKey();
@@ -0,0 +1,24 @@
+// WITH_REFLECT
+// FULL_JDK
+
+// FILE: 1.kt
+interface Test {
+    fun test() {
+    }
+}
+
+// FILE: 2.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+class TestClass : Test {
+
+}
+
+fun box(): String {
+    try {
+        TestClass::class.java.getDeclaredMethod("test")
+    }
+    catch (e: NoSuchMethodException) {
+        return "fail"
+    }
+    return "OK"
+}
@@ -0,0 +1,24 @@
+// WITH_REFLECT
+// FULL_JDK
+
+// FILE: 1.kt
+interface Test {
+    fun test() {
+    }
+}
+
+// FILE: 2.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+interface Test2 : Test {
+
+}
+
+fun box(): String {
+    try {
+        Test2::class.java.getDeclaredMethod("test")
+    }
+    catch (e: NoSuchMethodException) {
+        return "fail"
+    }
+    return "OK"
+}
@@ -0,0 +1,35 @@
+// WITH_REFLECT
+// FULL_JDK
+
+// FILE: 1.kt
+interface Test {
+    fun test() {
+    }
+}
+
+// FILE: 2.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+interface Test2 : Test {
+
+}
+
+interface Test3 : Test2 {
+
+}
+
+fun box(): String {
+    try {
+        Test2::class.java.getDeclaredMethod("test")
+    }
+    catch (e: NoSuchMethodException) {
+        return "fail 1"
+    }
+
+    try {
+        Test3::class.java.getDeclaredMethod("test")
+    }
+    catch (e: NoSuchMethodException) {
+        return "OK"
+    }
+    return "fail 2"
+}
@@ -0,0 +1,17 @@
+// FILE: 1.kt
+
+interface Test {
+    fun test(): String {
+        return "OK"
+    }
+}
+
+// FILE: 2.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+class TestClass : Test {
+
+}
+
+fun box(): String {
+    return TestClass().test()
+}
@@ -0,0 +1,22 @@
+// FILE: 1.kt
+
+interface Test {
+    fun test(): String {
+        return "OK"
+    }
+}
+
+// FILE: 2.kt
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
+interface Test2 : Test {
+
+}
+
+
+class TestClass : Test2 {
+
+}
+
+fun box(): String {
+    return TestClass().test()
+}
@@ -49,4 +49,52 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
            doTest(fileName);
        }
    }
+
+    @TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Jvm8against6 extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInJvm8against6() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("simpleCall.kt")
+        public void testSimpleCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCall.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleCallWithHierarchy.kt")
+        public void testSimpleCallWithHierarchy() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Delegation extends AbstractCompileKotlinAgainstKotlinTest {
+            public void testAllFilesPresentInDelegation() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("delegationToDefaultMethodInClass.kt")
+            public void testDelegationToDefaultMethodInClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("delegationToDefaultMethodInInterface.kt")
+            public void testDelegationToDefaultMethodInInterface() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("delegationToDefaultMethodInInterface2.kt")
+            public void testDelegationToDefaultMethodInInterface2() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface2.kt");
+                doTest(fileName);
+            }
+        }
+    }
 }