[Fir2IR] Don't build overrides for expect classes.

We don't need them except for checking.
And checking doesn't work in any reasonable way anyway.

^KT-65249 Fixed

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java

@@ -38301,6 +38301,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
         runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java

@@ -38301,6 +38301,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
         runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt

@@ -193,8 +193,16 @@ private fun IrFakeOverrideBuilder.buildForAll(
             element.acceptChildrenVoid(this)
         }
 
+        private fun isIgnoredClass(declaration: IrClass) : Boolean {
+            return when {
+                declaration.isExpect -> true
+                declaration.metadata is MetadataSource.CodeFragment -> true
+                else -> false
+            }
+        }
+
         override fun visitClass(declaration: IrClass) {
-            if (declaration.metadata !is MetadataSource.CodeFragment) {
+            if (!isIgnoredClass(declaration)) {
                 buildFakeOverrides(declaration)
             }
             declaration.acceptChildrenVoid(this)

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java

@@ -38146,6 +38146,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
         runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java

@@ -38146,6 +38146,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener
         runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java

@@ -38146,6 +38146,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
         runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt

@@ -0,0 +1,26 @@
+// LANGUAGE: +MultiPlatformProjects
+// MODULE: common
+// FILE: common.kt
+
+interface Source {
+    fun read(sink: Buffer): String
+}
+
+expect class Buffer()
+
+expect abstract class ForwardingSource: Source {
+    override fun read(sink: Buffer): String
+}
+
+// MODULE: jvm()()(common)
+// FILE: platfrom.kt
+
+actual class Buffer actual constructor()
+
+actual abstract class ForwardingSource : Source {
+    actual override fun read(sink: Buffer): String = "OK"
+}
+
+fun box() : String{
+    return (object : ForwardingSource() {}).read(Buffer())
+}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base {
     open fun <T> foo(t: T) {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open fun <T> foo(t: T) {}
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override fun <R> <!ACTUAL_WITHOUT_EXPECT!>foo<!>(t: R) {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.fir.kt

@@ -7,8 +7,8 @@ open class Base {
     open lateinit var green: String
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base {
+expect open class Foo : Base {
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.ll.kt

@@ -1,20 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open var red1: String = ""
-    open lateinit var red2: String
-    open lateinit var green: String
-}
-
-expect open class Foo : Base {
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override lateinit var <!ACTUAL_WITHOUT_EXPECT!>red1<!>: String
-    override var <!ACTUAL_WITHOUT_EXPECT!>red2<!>: String = ""
-    override lateinit var green: String
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.fir.kt

@@ -5,7 +5,7 @@ interface Base {
     fun foo()
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!> : Base<!>
+expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!> : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-interface Base {
-    fun foo()
-}
-
-expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!> : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base {
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>() {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.fir.kt

@@ -3,7 +3,7 @@
 interface Base {
     fun foo()
 }
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!>() : Base<!>
+expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!>() : Base
 
 
 // MODULE: m2-jvm()()(m1-common)

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.ll.kt

@@ -1,17 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-interface Base {
-    fun foo()
-}
-expect open <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Foo<!>() : Base
-
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-// Mismatched scope must be reported here. But it's false negative checker in K1.
-// For some reason, K1 says that modality of `exect_Foo.foo` is `abstract`.
-// https://youtrack.jetbrains.com/issue/KT-59739
-actual open class Foo : Base {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>() {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.fir.kt

@@ -3,7 +3,7 @@
 interface Base {
     fun foo() {}
 }
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect abstract class Foo() : Base<!>
+expect abstract class Foo() : Base
 
 
 // MODULE: m2-jvm()()(m1-common)

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.ll.kt

@@ -1,14 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-interface Base {
-    fun foo() {}
-}
-expect abstract class Foo() : Base
-
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual abstract class Foo : Base {
-    abstract override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>()
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base {
     open fun foo() {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open fun foo() {}
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>() {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base<T> {
     open fun foo(t: T) {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<String><!>
+expect open class Foo : Base<String>
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base<T> {
-    open fun foo(t: T) {}
-}
-
-expect open class Foo : Base<String>
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base<String>() {
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(t: String) {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.fir.kt

@@ -1,7 +1,7 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo<!>
+expect open class Foo
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.ll.kt

@@ -1,11 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-expect open class Foo
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo {
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>toString<!>() = "Foo"
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base {
     open fun foo(param: Int) {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo1 : Base<!>
+expect open class Foo1 : Base
 expect open class Foo2 : Base
 expect open class Foo3 {
     open fun foo(param: Int)

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.ll.kt

@@ -1,34 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open fun foo(param: Int) {}
-}
-
-expect open class Foo1 : Base
-expect open class Foo2 : Base
-expect open class Foo3 {
-    open fun foo(param: Int)
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo1 : Base() {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(paramNameChanged: Int) {}
-}
-
-actual typealias Foo2 = Foo2Java
-actual typealias Foo3 = Foo3Java
-
-// FILE: Foo2Java.java
-
-public class Foo2Java extends Base {
-    @Override
-    public void foo(int paramNameChanged) {}
-}
-
-// FILE: Foo3Java.java
-public class Foo3Java {
-    public void foo(int paramNameChanged) {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.fir.kt

@@ -6,7 +6,7 @@ open class Base {
         protected set
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt

@@ -1,17 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open var foo: String = ""
-        protected set
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override var <!ACTUAL_WITHOUT_EXPECT!>foo<!>: String = ""
-        public set
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.fir.kt

@@ -5,8 +5,8 @@ open class Base {
     open fun foo(vararg bar: Int) {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base {
+expect open class Foo : Base {
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.ll.kt

@@ -1,16 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open fun foo(vararg bar: Int) {}
-}
-
-expect open class Foo : Base {
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(bar: IntArray) {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base {
     protected open fun foo() {}
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    protected open fun foo() {}
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    public override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>() {}
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.fir.kt

@@ -6,8 +6,8 @@ open class Base {
     open fun foo(): Any = ""
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base {
+expect open class Foo : Base {
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.ll.kt

@@ -1,17 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open val foo: String = ""
-    open fun foo(): Any = ""
-}
-
-expect open class Foo : Base {
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(): String = ""
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.fir.kt

@@ -7,8 +7,8 @@ open class Base {
     open fun foo(): I = null!!
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo<T : I> : Base {
+expect open class Foo<T : I> : Base {
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.ll.kt

@@ -1,18 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-interface I
-
-open class Base {
-    open fun foo(): I = null!!
-}
-
-expect open class Foo<T : I> : Base {
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo<T : I> : Base() {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(): T = null!!
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.fir.kt

@@ -5,8 +5,8 @@ open class Base<R> {
     open fun foo(): R = null!!
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo<R, T : R> : Base<R> {
+expect open class Foo<R, T : R> : Base<R> {
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.ll.kt

@@ -1,16 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base<R> {
-    open fun foo(): R = null!!
-}
-
-expect open class Foo<R, T : R> : Base<R> {
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo<E, F : E> : Base<E>() {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(): F = null!!
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.fir.kt

@@ -6,7 +6,7 @@ open class Base {
     open fun foo(): String = ""
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.ll.kt

@@ -1,16 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open val foo: Any = ""
-    open fun foo(): String = ""
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override val <!ACTUAL_WITHOUT_EXPECT!>foo<!>: String = ""
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.fir.kt

@@ -5,9 +5,9 @@ expect open class Base {
     open fun foo(): MutableList<String>
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base {
+expect open class Foo : Base {
 
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.ll.kt

@@ -1,33 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-expect open class Base {
-    open fun foo(): MutableList<String>
-}
-
-expect open class Foo : Base {
-
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual typealias Base = BaseJava
-
-actual open class Foo : Base() {
-    // K1 doesn't report a diagnostic here because when it compares scopes it sees flexible type
-    // K2 will likely report a diagnostic here
-    // I don't think we can fix this 'K1 green -> K2 red'. It must be a rare case anyway.
-    override fun <!ACTUAL_WITHOUT_EXPECT!>foo<!>(): List<String> {
-        return super.foo()
-    }
-}
-
-// FILE: BaseJava.java
-import java.util.List;
-
-public class BaseJava {
-    public List<String> foo() {
-        return null;
-    }
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.fir.kt

@@ -5,7 +5,7 @@ open class Base {
     open val foo: Int = 1
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base<!>
+expect open class Foo : Base
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.ll.kt

@@ -1,15 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base {
-    open val foo: Int = 1
-}
-
-expect open class Foo : Base
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    override var <!ACTUAL_WITHOUT_EXPECT!>foo<!>: Int = 1
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.fir.kt

@@ -8,10 +8,10 @@ open class Base() {
     protected open fun overrideVisibility(): Any = ""
 }
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Base {
+expect open class Foo : Base {
     fun existingMethod()
     val existingParam: Int
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.ll.kt

@@ -1,29 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-open class Base() {
-    open fun overrideReturnType(): Any = ""
-    open fun overrideModality1(): Any = ""
-    open fun overrideModality2(): Any = ""
-    protected open fun overrideVisibility(): Any = ""
-}
-
-expect open class Foo : Base {
-    fun existingMethod()
-    val existingParam: Int
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Foo : Base() {
-    actual fun existingMethod() {}
-    actual val existingParam: Int = 904
-
-    fun injectedMethod() {}
-    val injectedProperty: Int = 42
-    override fun <!ACTUAL_WITHOUT_EXPECT!>overrideReturnType<!>(): String = ""
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>overrideModality1<!>(): Any = ""
-    final override fun <!ACTUAL_WITHOUT_EXPECT!>overrideModality2<!>(): Any = ""
-    public override fun <!ACTUAL_WITHOUT_EXPECT!>overrideVisibility<!>(): Any = ""
-}

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt

@@ -10,10 +10,10 @@ expect open class Base<T>() {
 
 open class Transitive : Base<String>()
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Transitive {
+expect open class Foo : Transitive {
     fun existingMethod()
     val existingParam: Int
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.ll.kt

@@ -1,31 +0,0 @@
-// FIR status: KT-65249 K2: False positive modality is different for native compilation
-
-// WITH_STDLIB
-// MODULE: m1-common
-// FILE: common.kt
-
-expect open class Base<T>() {
-    fun existingMethodInBase(param: T)
-}
-
-open class Transitive : Base<String>()
-
-expect open class Foo : Transitive {
-    fun existingMethod()
-    val existingParam: Int
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-actual open class Base<T> {
-    actual fun existingMethodInBase(param: T) {}
-    open fun injected(param: T): Any = ""
-}
-
-actual open class Foo : Transitive() {
-    actual fun existingMethod() {}
-    actual val existingParam: Int = 904
-
-    override fun injected(param: String): String = "" // covariant override
-}

compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.fir.kt

@@ -1,10 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect enum class En {
-    E1,
-    <!EXPECTED_ENUM_ENTRY_WITH_BODY!>E2 {
-        <!EXPECTED_DECLARATION_WITH_BODY!>fun foo()<!> = ""
-    },<!>
-    <!EXPECTED_ENUM_ENTRY_WITH_BODY!>E3 { };<!>
-}<!>

compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // MODULE: m1-common
 // FILE: common.kt
 

compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.ll.kt

@@ -1,10 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-expect enum class En {
-    E1,
-    <!EXPECTED_ENUM_ENTRY_WITH_BODY!>E2 {
-        <!EXPECTED_DECLARATION_WITH_BODY!>fun foo()<!> = ""
-    },<!>
-    <!EXPECTED_ENUM_ENTRY_WITH_BODY!>E3 { };<!>
-}

compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.fir.kt

@@ -1,5 +1,5 @@
 // MODULE: m1-common
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect interface Base<!>
+expect interface Base
 
 // MODULE: m1-jvm()()(m1-common)
 actual interface Base {

compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.ll.kt

@@ -1,7 +0,0 @@
-// MODULE: m1-common
-expect interface Base
-
-// MODULE: m1-jvm()()(m1-common)
-actual interface Base {
-    override fun <!ACTUAL_WITHOUT_EXPECT!>equals<!>(other: Any?): Boolean
-}

compiler/testData/diagnostics/tests/multiplatform/platformRedeclarationOfExpect.fir.kt

@@ -1,7 +1,7 @@
 // MODULE: common
 // FILE: common.kt
-expect class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo<!>
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo<!><!>
 
 // MODULE: main()()(common)
 // FILE: test.kt
-expect class Foo
+<!NO_ACTUAL_FOR_EXPECT!>expect class Foo<!>

compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.fir.kt

@@ -2,10 +2,9 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-// K2: false positve INCOMPATIBLE_MATCHING: KT-60155
+public expect abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>public expect abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
     override val values: MutableCollection<V>
-}<!>
+}
 
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.kt

@@ -2,7 +2,6 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-// K2: false positve INCOMPATIBLE_MATCHING: KT-60155
 public expect abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
     override val values: MutableCollection<V>
 }

compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt

@@ -1,15 +0,0 @@
-// WITH_STDLIB
-// MODULE: m1-common
-// FILE: common.kt
-
-// K2: false positve INCOMPATIBLE_MATCHING: KT-60155
-public expect abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
-    override val values: MutableCollection<V>
-}
-
-// MODULE: m2-jvm()()(m1-common)
-// FILE: jvm.kt
-
-import java.util.AbstractMap
-
-public actual abstract class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>AbstractMutableMap<!><K, V>() : MutableMap<K, V>, AbstractMap<K, V>()

compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.fir.kt

@@ -1,8 +1,8 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}!>expect class E01<!>
+expect class E01
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}!>expect class E02<!>
+expect class E02
 
 // MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.ll.kt

@@ -1,13 +0,0 @@
-// MODULE: m1-common
-// FILE: common.kt
-
-expect class E01
-expect class E02
-
-// MODULE: m1-jvm()()(m1-common)
-// FILE: jvm.kt
-
-typealias MyNothing = Nothing
-
-<!ACTUAL_TYPE_ALIAS_TO_NOTHING!>actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>E01<!> = Nothing<!>
-<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>E02<!> = MyNothing<!>

compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.fir.kt

@@ -2,8 +2,8 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}!>expect class E01<!>
+expect class E01
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}!>expect class E02<!>
+expect class E02
 
 // MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.ll.kt

@@ -1,14 +0,0 @@
-// LANGUAGE: -MultiplatformRestrictions
-// MODULE: m1-common
-// FILE: common.kt
-
-expect class E01
-expect class E02
-
-// MODULE: m1-jvm()()(m1-common)
-// FILE: jvm.kt
-
-typealias MyNothing = Nothing
-
-actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>E01<!> = Nothing
-<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>E02<!> = MyNothing<!>

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java

@@ -27394,6 +27394,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
         runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java

@@ -27394,6 +27394,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
         runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java

@@ -30465,6 +30465,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
           runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt");
         }
 
+        @Test
+        @TestMetadata("kt-65249.kt")
+        public void testKt_65249() {
+          runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+        }
+
         @Test
         @TestMetadata("mergedOverrides.kt")
         public void testMergedOverrides() {

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java

@@ -31149,6 +31149,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
           runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt");
         }
 
+        @Test
+        @TestMetadata("kt-65249.kt")
+        public void testKt_65249() {
+          runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+        }
+
         @Test
         @TestMetadata("mergedOverrides.kt")
         public void testMergedOverrides() {

wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java

@@ -27364,6 +27364,12 @@ public class FirWasmJsCodegenBoxTestGenerated extends AbstractFirWasmJsCodegenBo
         runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt");
       }
 
+      @Test
+      @TestMetadata("kt-65249.kt")
+      public void testKt_65249() {
+        runTest("compiler/testData/codegen/box/multiplatform/k2/kt-65249.kt");
+      }
+
       @Test
       @TestMetadata("mergedOverrides.kt")
       public void testMergedOverrides() {