From b27955d2680660d928fefe8e0ee9ce0a4b788cf5 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 5 Oct 2020 14:22:41 +0200
Subject: [PATCH] Wrong specialization diagnostic is reported on java default
 inheritance

---
 .../resolve/jvm/checkers/JvmDefaultChecker.kt |  2 +-
 .../library/test/JavaInterface.java           |  7 ++++++
 .../library/test/JavaInterface2.java          |  5 ++++
 .../output.txt                                |  1 +
 .../source.kt                                 | 25 +++++++++++++++++++
 .../CompileKotlinAgainstCustomBinariesTest.kt |  5 ++++
 6 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface.java
 create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface2.java
 create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/output.txt
 create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/source.kt

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmDefaultChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmDefaultChecker.kt
index 421687b68af..c9a90939f23 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmDefaultChecker.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmDefaultChecker.kt
@@ -154,7 +154,7 @@ class JvmDefaultChecker(val jvmTarget: JvmTarget, project: Project) : Declaratio
         declaration: KtDeclaration,
         performSpecializationCheck: Boolean
     ): Boolean {
-        if (!performSpecializationCheck) return true
+        if (!performSpecializationCheck || actualImplementation is JavaMethodDescriptor) return true
         val inheritedSignature = inheritedFun.computeJvmDescriptor(withReturnType = true, withName = false)
         val originalImplementation = actualImplementation.original
         val actualSignature = originalImplementation.computeJvmDescriptor(withReturnType = true, withName = false)
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface.java b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface.java
new file mode 100644
index 00000000000..c73c3e334bc
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface.java
@@ -0,0 +1,7 @@
+package test;
+
+public interface JavaInterface<T> {
+    default T test(T p) {
+        return p;
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface2.java b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface2.java
new file mode 100644
index 00000000000..996bf4f5d0c
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/library/test/JavaInterface2.java
@@ -0,0 +1,5 @@
+package test;
+
+public interface JavaInterface2<T> extends JavaInterface<T> {
+
+}
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/output.txt
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/output.txt
@@ -0,0 +1 @@
+OK
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/source.kt
new file mode 100644
index 00000000000..34008c68791
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultCompatibilityAgainsJava/source.kt
@@ -0,0 +1,25 @@
+import test.*
+
+interface KotlinInterface<K> : JavaInterface<String> {
+
+}
+
+interface KotlinInterface2 : JavaInterface2<String> {
+
+}
+
+open class KotlinClass : JavaInterface<String> {
+
+}
+
+open class KotlinClass2 : JavaInterface2<String> {
+
+}
+
+open class KotlinClass_2 : KotlinClass() {
+
+}
+
+open class KotlinClass2_2 : KotlinClass2() {
+
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
index b957321bb59..c0210951b13 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
@@ -632,6 +632,11 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
         compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-jvm-target", "1.8", "-Xjvm-default=all"))
     }
 
+    fun testJvmDefaultCompatibilityAgainstJava() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xjvm-default=disable"))
+        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-jvm-target", "1.8", "-Xjvm-default=all-compatibility"))
+    }
+
     fun testInternalFromForeignModuleJs() {
         compileKotlin("source.kt", File(tmpdir, "usage.js"), listOf(compileJsLibrary("library")), K2JSCompiler())
     }