JvmDefault. Support @JvmDefaultWithCompatibility annotation

#KT-48217 Fixed

libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt

@@ -3227,6 +3227,9 @@ public final class kotlin/jvm/JvmClassMappingKt {
 public abstract interface annotation class kotlin/jvm/JvmDefault : java/lang/annotation/Annotation {
 }
 
+public abstract interface annotation class kotlin/jvm/JvmDefaultWithCompatibility : java/lang/annotation/Annotation {
+}
+
 public abstract interface annotation class kotlin/jvm/JvmDefaultWithoutCompatibility : java/lang/annotation/Annotation {
 }
 

libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestGenerated.java

@@ -140,5 +140,15 @@ public class KotlinpTestGenerated extends AbstractKotlinpTest {
         public void testAllFilesPresentInJvmDefault() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData/jvmDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
+
+        @TestMetadata("withCompatibility.kt")
+        public void testWithCompatibility() throws Exception {
+            runTest("libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt");
+        }
+
+        @TestMetadata("withoutCompatibility.kt")
+        public void testWithoutCompatibility() throws Exception {
+            runTest("libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt");
+        }
     }
 }

libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt

@@ -0,0 +1,8 @@
+// !JVM_DEFAULT_MODE: all
+@JvmDefaultWithCompatibility
+interface A {
+    fun f() {}
+}
+
+@JvmDefaultWithCompatibility
+interface B : A

libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.txt

@@ -0,0 +1,35 @@
+// A.class
+// ------------------------------------------
+// requires compiler version 1.4.0 (level=ERROR)
+public abstract interface A : kotlin/Any {
+
+  // signature: f()V
+  public open fun f(): kotlin/Unit
+
+  // module name: test-module
+
+  // has method bodies in interface
+
+  // is compiled in compatibility mode
+}
+// A$DefaultImpls.class
+// ------------------------------------------
+synthetic class
+// B.class
+// ------------------------------------------
+// requires compiler version 1.4.0 (level=ERROR)
+public abstract interface B : A {
+
+  // module name: test-module
+
+  // has method bodies in interface
+
+  // is compiled in compatibility mode
+}
+// B$DefaultImpls.class
+// ------------------------------------------
+synthetic class
+// META-INF/test-module.kotlin_module
+// ------------------------------------------
+module {
+}

libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt

@@ -0,0 +1,7 @@
+// !JVM_DEFAULT_MODE: all-compatibility
+@JvmDefaultWithoutCompatibility
+interface A {
+    fun f() {}
+}
+
+interface B : A

libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.txt

@@ -0,0 +1,28 @@
+// A.class
+// ------------------------------------------
+public abstract interface A : kotlin/Any {
+
+  // signature: f()V
+  public open fun f(): kotlin/Unit
+
+  // module name: test-module
+
+  // has method bodies in interface
+}
+// B.class
+// ------------------------------------------
+public abstract interface B : A {
+
+  // module name: test-module
+
+  // has method bodies in interface
+
+  // is compiled in compatibility mode
+}
+// B$DefaultImpls.class
+// ------------------------------------------
+synthetic class
+// META-INF/test-module.kotlin_module
+// ------------------------------------------
+module {
+}