JVM: update test data after enabling IR fake override builder

#KT-61514 Fixed
2024-01-09 16:08:15 +01:00
parent f98a22e8e4
commit dfd9aabf8e
83 changed files with 244 additions and 1006 deletions
@@ -1,3 +1,5 @@
+// FIR status: KT-65249 K2: False positive modality is different for native compilation
+
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -8,10 +10,10 @@ expect open class Base<T>() {

 open class Transitive : Base<String>()

-expect open class Foo : Transitive {
+<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo : Transitive {
    fun existingMethod()
    val existingParam: Int
-}
+}<!>

 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
@@ -1,3 +1,5 @@
+// FIR status: KT-65249 K2: False positive modality is different for native compilation
+
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -0,0 +1,31 @@
+// 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
+}
@@ -1,7 +1,7 @@
 // MODULE: m1-common
 // FILE: common.kt

-expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!>
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!><!>
 actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!>

 // MODULE: m1-jvm()()(m1-common)
@@ -0,0 +1,11 @@
+// MODULE: m1-common
+// FILE: common.kt
+
+expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!>
+actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!>
+
+// MODULE: m1-jvm()()(m1-common)
+// FILE: jvm.kt
+
+expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>B<!>
+actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>B<!>
@@ -1,7 +1,7 @@
 // MODULE: m1-common
 // FILE: common.kt

-expect class A
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect class A<!>

 // FILE: common2.kt
 actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>A<!>
@@ -1,7 +1,7 @@
 // MODULE: common
 // TARGET_PLATFORM: Common
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect class A() : B<!>
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect class C() : B<!>
+expect class A() : B
+expect class C() : B
 expect open class B()

 // MODULE: intermediate()()(common)
@@ -1,8 +1,8 @@
 // MODULE: common
 // TARGET_PLATFORM: Common
-<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect class Foo() {
-    <!NO_ACTUAL_FOR_EXPECT{JVM}!>fun foo()<!>
-}<!>
+expect class Foo() {
+    fun foo()
+}

 // MODULE: intermediate()()(common)
 // TARGET_PLATFORM: Common
@@ -1,12 +1,12 @@
 // MODULE: common
 // TARGET_PLATFORM: Common

-expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>CommonClass<!> {
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>CommonClass<!> {
    fun memberFun()
    val memberProp: Int
    class Nested
    inner class Inner
-}
+}<!>
 actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>CommonClass<!> {
    actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
    actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
@@ -14,10 +14,10 @@ actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>Comm
    actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
 }

-expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonFun<!>()
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonFun<!>()<!>
 actual fun <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonFun<!>() {}

-expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonProperty<!>: String
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonProperty<!>: String<!>
 actual val <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonProperty<!>: String
    get() = "hello"

@@ -0,0 +1,67 @@
+// MODULE: common
+// TARGET_PLATFORM: Common
+
+expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>CommonClass<!> {
+    fun memberFun()
+    val memberProp: Int
+    class Nested
+    inner class Inner
+}
+actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>CommonClass<!> {
+    actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
+    actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
+    actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
+    actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
+}
+
+expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonFun<!>()
+actual fun <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonFun<!>() {}
+
+expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonProperty<!>: String
+actual val <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>commonProperty<!>: String
+    get() = "hello"
+
+// MODULE: intermediate()()(common)
+// TARGET_PLATFORM: Common
+
+expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>IntermediateClass<!> {
+    fun memberFun()
+    val memberProp: Int
+    class Nested
+    inner class Inner
+}
+actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>IntermediateClass<!> {
+    actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
+    actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
+    actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
+    actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
+}
+
+expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>intermediateFun<!>()
+actual fun <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>intermediateFun<!>() {}
+
+expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>intermediateProperty<!>: String
+actual val <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>intermediateProperty<!>: String
+    get() = "hello"
+
+// MODULE: main()()(intermediate)
+
+expect class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>PlatformClass<!> {
+    fun memberFun()
+    val memberProp: Int
+    class Nested
+    inner class Inner
+}
+actual class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>PlatformClass<!> {
+    actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
+    actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
+    actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
+    actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
+}
+
+expect fun <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>platformFun<!>()
+actual fun <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>platformFun<!>() {}
+
+expect val <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>platformProperty<!>: String
+actual val <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>platformProperty<!>: String
+    get() = "hello"
@@ -4,7 +4,7 @@
 expect fun parameterCount()
 fun parameterCount(p: String) {}

-expect fun parameterCount2()
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect fun parameterCount2()<!>
 actual fun <!ACTUAL_WITHOUT_EXPECT!>parameterCount2<!>(p: String) {}

 expect fun callableKind(): Int
@@ -13,9 +13,9 @@ val callableKind: Int = 1
 expect fun <T> typeParameterCount()
 fun typeParameterCount() {}

-expect enum class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>EnumEntries<!> {
+<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect enum class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>EnumEntries<!> {
    ONE, TWO;
-}
+}<!>
 actual enum class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>EnumEntries<!> {
    ONE;
 }
@@ -0,0 +1,31 @@
+// MODULE: common
+// TARGET_PLATFORM: Common
+
+expect fun parameterCount()
+fun parameterCount(p: String) {}
+
+expect fun parameterCount2()
+actual fun <!ACTUAL_WITHOUT_EXPECT!>parameterCount2<!>(p: String) {}
+
+expect fun callableKind(): Int
+val callableKind: Int = 1
+
+expect fun <T> typeParameterCount()
+fun typeParameterCount() {}
+
+expect enum class <!EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>EnumEntries<!> {
+    ONE, TWO;
+}
+actual enum class <!ACTUAL_WITHOUT_EXPECT, EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE!>EnumEntries<!> {
+    ONE;
+}
+
+expect fun vararg(bar: Int)
+fun vararg(vararg bar: Int) = Unit
+
+// MODULE: main()()(common)
+
+actual fun parameterCount() {}
+actual fun <T> typeParameterCount() {}
+actual fun callableKind(): Int = 1
+actual fun vararg(bar: Int) = Unit
@@ -10,8 +10,8 @@ expect annotation class A()

 fun useInSignature(a: <!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY!>A<!>) = a.toString()

-<!NO_ACTUAL_FOR_EXPECT{JVM}!><!WRONG_ANNOTATION_TARGET!>@OptionalExpectation<!>
-expect class NotAnAnnotationClass<!>
+<!WRONG_ANNOTATION_TARGET!>@OptionalExpectation<!>
+expect class NotAnAnnotationClass

 <!OPTIONAL_EXPECTATION_NOT_ON_EXPECTED!>@OptionalExpectation<!>
 annotation class NotAnExpectedClass
@@ -1,44 +0,0 @@
-// WITH_STDLIB
-// !OPT_IN: kotlin.ExperimentalMultiplatform
-
-// MODULE: common
-// TARGET_PLATFORM: Common
-// FILE: common.kt
-
-@OptionalExpectation
-expect annotation class A()
-
-fun useInSignature(a: <!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY!>A<!>) = a.toString()
-
-<!WRONG_ANNOTATION_TARGET!>@OptionalExpectation<!>
-expect class NotAnAnnotationClass
-
-<!OPTIONAL_EXPECTATION_NOT_ON_EXPECTED!>@OptionalExpectation<!>
-annotation class NotAnExpectedClass
-
-annotation class InOtherAnnotation(val a: <!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY!>A<!>)
-
-@InOtherAnnotation(<!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY!>A()<!>)
-fun useInOtherAnnotation() {}
-
-expect class C {
-    @OptionalExpectation
-    annotation class Nested
-}
-
-// MODULE: platform()()(common)
-// FILE: platform.kt
-
-@<!OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE!>A<!>
-class D
-
-fun useInReturnType(): <!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY, OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE!>A?<!> = null
-
-annotation class AnotherAnnotation(val a: <!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY, OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE!>A<!>)
-
-@AnotherAnnotation(<!OPTIONAL_DECLARATION_OUTSIDE_OF_ANNOTATION_ENTRY, OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE!>A()<!>)
-fun useInAnotherAnnotation() {}
-
-actual class C {
-    actual annotation class Nested
-}
@@ -13,7 +13,7 @@ expect interface I2<out R> {
    suspend fun invoke(): R
 }

-<!AMBIGUOUS_ACTUALS{JVM}, AMBIGUOUS_ACTUALS{JVM}, EXPECT_ACTUAL_INCOMPATIBILITY{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JVM}!>expect interface ExpectInterface : I1<Int>, I2<Int><!>
+expect interface ExpectInterface : I1<Int>, I2<Int>

 interface CommonInterface : <!MIXING_SUSPEND_AND_NON_SUSPEND_SUPERTYPES!>I1<Int>, I2<Int><!>