[FE 1.0] 2/2 Drop AllowDifferentMembersInActual from compiler and tes…

…tData The annotation was dropped in the previous commit
JetBrains · Oct 20, 2023 · 6982fa1 · 6982fa1
1 parent 882f468
commit 6982fa1
Show file tree

Hide file tree

Showing 25 changed files with 119 additions and 136 deletions.
diff --git a/...jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java b/...jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
diff --git a/...n/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java b/...n/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
diff --git a/...esolve/checkers/ActualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker.kt b/...esolve/checkers/ActualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker.kt
@@ -86,8 +86,6 @@ private fun checkExpectActualScopeDiff(
     }
 }
 
-private val allowDifferentMembersInActualFqn = FqName("kotlin.AllowDifferentMembersInActual")
-
 @OptIn(ExperimentalContracts::class)
 internal fun matchActualWithNonFinalExpect(
     declaration: KtDeclaration,
@@ -110,10 +108,6 @@ internal fun matchActualWithNonFinalExpect(
 
     if (!descriptor.isActual) return null
 
-    with(OptInUsageChecker) {
-        if (declaration.isDeclarationAnnotatedWith(allowDifferentMembersInActualFqn, context.trace.bindingContext)) return null
-    }
-
     val actual = when (descriptor) {
         is ClassDescriptor -> descriptor
         is TypeAliasDescriptor -> descriptor.classDescriptor

diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt
@@ -21,8 +21,6 @@ actual interface I {
     actual fun test(source: String = "actual")
 }
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface J : I {
     override fun test(source: String) {
         if (source != "actual") throw AssertionError(source)

diff --git a/compiler/testData/codegen/box/multiplatform/hmpp/simple.kt b/compiler/testData/codegen/box/multiplatform/hmpp/simple.kt
@@ -26,8 +26,6 @@ fun getB(): B = B()
 
 // MODULE: main()()(intermediate)
 // FILE: main.kt
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual open class A actual constructor() {
     fun bar(): String = "K"
 }

diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt
@@ -18,16 +18,12 @@ class B : A()
 // MODULE: platform()()(common)
 // FILE: platform.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface S1 {
     fun o(): S = "O"
     val p: Boolean
         get() = true
 }
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface S2 {
     fun k() = "K"
 }

diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt
@@ -18,8 +18,6 @@ class B : A()
 // MODULE: platform()()(common)
 // FILE: platform.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface S1 {
     fun s1() = "O"
 }
@@ -28,13 +26,9 @@ interface S20 {
     fun s2() = "K"
 }
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface S2 : S20 {
 }
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual interface S : S1, S2 {
     fun s3() = s1() + s2()
 }

diff --git a/...HasTheSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_class.kt b/...HasTheSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_class.kt
diff --git a/...heSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_typealias.kt b/...heSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_typealias.kt
diff --git a/...pectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper.fir.kt b/...pectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper.fir.kt
@@ -14,8 +14,6 @@ expect open class Foo : Base {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual open class Base {
     actual fun existingMethodInBase() {}
     open fun injected(): Any = ""

diff --git a/...alExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper.kt b/...alExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper.kt
@@ -14,11 +14,9 @@ expect open class Foo : Base {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual open class Base {
+actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Base<!> {
     actual fun existingMethodInBase() {}
-    open fun injected(): Any = ""
+    open fun <!NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING!>injected<!>(): Any = ""
 }
 
 actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Foo<!> : Base() {

diff --git a/...pectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt b/...pectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt
@@ -16,8 +16,6 @@ expect open class Foo : Transitive {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
 actual open class Base<T> {
     actual fun existingMethodInBase(param: T) {}
     open fun injected(param: T): Any = ""

diff --git a/...IsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt b/...IsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt
@@ -16,11 +16,9 @@ expect open class Foo : Transitive {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual open class Base<T> {
+actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Base<!><T> {
     actual fun existingMethodInBase(param: T) {}
-    open fun injected(param: T): Any = ""
+    open fun <!NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING!>injected<!>(param: T): Any = ""
 }
 
 actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Foo<!> : Transitive() {

diff --git a/...eSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_injectMethod.fir.kt b/...eSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_injectMethod.fir.kt
@@ -0,0 +1,25 @@
+// WITH_STDLIB
+// MODULE: m1-common
+// FILE: common.kt
+
+expect open class Base {
+    fun existingMethodInBase()
+}
+
+expect open class Foo : Base {
+    fun existingMethod()
+    val existingParam: Int
+}
+
+// MODULE: m2-jvm()()(m1-common)
+// FILE: jvm.kt
+
+actual open class Base {
+    actual fun existingMethodInBase() {}
+    fun injected() {}
+}
+
+actual open class Foo : Base() {
+    actual fun existingMethod() {}
+    actual val existingParam: Int = 904
+}
diff --git a/...asTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_injectMethod.kt b/...asTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_injectMethod.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -15,11 +14,9 @@ expect open class Foo : Base {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual open class Base {
+actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Base<!> {
     actual fun existingMethodInBase() {}
-    fun injected() {}
+    fun <!NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING!>injected<!>() {}
 }
 
 actual open class Foo : Base() {

diff --git a/...ierChecker/supertypeIsExpectActual_injectMethod_transitiveSubstitutionFakeOverride.fir.kt b/...ierChecker/supertypeIsExpectActual_injectMethod_transitiveSubstitutionFakeOverride.fir.kt
@@ -0,0 +1,27 @@
+// 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) {}
+    fun injected() {}
+}
+
+actual open class Foo : Transitive() {
+    actual fun existingMethod() {}
+    actual val existingParam: Int = 904
+}
diff --git a/...ssifierChecker/supertypeIsExpectActual_injectMethod_transitiveSubstitutionFakeOverride.kt b/...ssifierChecker/supertypeIsExpectActual_injectMethod_transitiveSubstitutionFakeOverride.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -17,11 +16,9 @@ expect open class Foo : Transitive {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual open class Base<T> {
+actual open <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>class Base<!><T> {
     actual fun existingMethodInBase(param: T) {}
-    fun injected() {}
+    fun <!NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING!>injected<!>() {}
 }
 
 actual open class Foo : Transitive() {

diff --git a/...tClassifierChecker/supertypeIsExpectActual_supertypeIsActualTypealias_injectMethod.fir.kt b/...tClassifierChecker/supertypeIsExpectActual_supertypeIsActualTypealias_injectMethod.fir.kt
@@ -0,0 +1,27 @@
+// WITH_STDLIB
+// MODULE: m1-common
+// FILE: common.kt
+
+expect open class Base() {
+    fun existingMethodInBase()
+}
+
+expect open class Foo : Base {
+    fun existingMethod()
+    val existingParam: Int
+}
+
+// MODULE: m2-jvm()()(m1-common)
+// FILE: jvm.kt
+
+actual typealias Base = BaseImpl
+
+open class BaseImpl {
+    fun existingMethodInBase() {}
+    fun injected() {}
+}
+
+actual open class Foo : Base() {
+    actual fun existingMethod() {}
+    actual val existingParam: Int = 904
+}
diff --git a/...xpectClassifierChecker/supertypeIsExpectActual_supertypeIsActualTypealias_injectMethod.kt b/...xpectClassifierChecker/supertypeIsExpectActual_supertypeIsActualTypealias_injectMethod.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -15,9 +14,7 @@ expect open class Foo : Base {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual typealias Base = BaseImpl
+actual typealias <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>Base<!> = BaseImpl
 
 open class BaseImpl {
     fun existingMethodInBase() {}

diff --git a/...tActual_supertypeIsActualTypealias_injectMethod_transitiveSubstitutionFakeOverride.fir.kt b/...tActual_supertypeIsActualTypealias_injectMethod_transitiveSubstitutionFakeOverride.fir.kt
@@ -0,0 +1,29 @@
+// 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 typealias Base<T> = BaseImpl<T>
+
+open class BaseImpl<T> {
+    fun existingMethodInBase(param: T) {}
+    fun injected() {}
+}
+
+actual open class Foo : Transitive() {
+    actual fun existingMethod() {}
+    actual val existingParam: Int = 904
+}
diff --git a/...xpectActual_supertypeIsActualTypealias_injectMethod_transitiveSubstitutionFakeOverride.kt b/...xpectActual_supertypeIsActualTypealias_injectMethod_transitiveSubstitutionFakeOverride.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // WITH_STDLIB
 // MODULE: m1-common
 // FILE: common.kt
@@ -17,9 +16,7 @@ expect open class Foo : Transitive {
 // MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
-@OptIn(ExperimentalMultiplatform::class)
-@AllowDifferentMembersInActual
-actual typealias Base<T> = BaseImpl<T>
+actual typealias <!ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING!>Base<!><T> = BaseImpl<T>
 
 open class BaseImpl<T> {
     fun existingMethodInBase(param: T) {}

diff --git a/...er/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt b/...er/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt
@@ -12,6 +12,4 @@
 
 import java.util.AbstractMap
 
-@OptIn(kotlin.ExperimentalMultiplatform::class)
-@kotlin.AllowDifferentMembersInActual
 public actual abstract class AbstractMutableMap<K, V>() : MutableMap<K, V>, AbstractMap<K, V>()