From d85d671b26f5ccd5398b5c9afad9c720fc111f55 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 15 Nov 2023 14:46:07 +0200 Subject: [PATCH] [FIR] Update few MPP diagnostic tests Updated tests contain errors which are incompatible with fir2ir conversion (like `PACKAGE_OR_CLASSIFIER_REDECLARATION` and `EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE`), so running fir2ir on such code may lead to exceptions --- ...eclarationWithWeakIncompatibilities.fir.kt | 8 +-- ...DeclarationWithWeakIncompatibilities.ll.kt | 27 -------- .../expectAndActualInTheSameModule.fir.kt | 8 +-- .../expectAndActualInTheSameModule.ll.kt | 67 ------------------- ...ualInTheSameModuleIncompatibilities.fir.kt | 6 +- ...tualInTheSameModuleIncompatibilities.ll.kt | 31 --------- 6 files changed, 11 insertions(+), 136 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt delete mode 100644 compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt delete mode 100644 compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt index 2064b039f68..c632c74dc2c 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt @@ -2,14 +2,14 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo1 -expect class Foo2 +expect class Foo1 +expect class Foo2 expect fun foo2(): Int -expect val s: String +expect val s: String -expect open class Foo3 +expect open class Foo3 // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt deleted file mode 100644 index c632c74dc2c..00000000000 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt +++ /dev/null @@ -1,27 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -// MODULE: m1-common -// FILE: common.kt - -expect class Foo1 -expect class Foo2 - -expect fun foo2(): Int - -expect val s: String - -expect open class Foo3 - -// MODULE: m2-jvm()()(m1-common) - -// FILE: jvm.kt - -interface Foo1 -actual interface Foo2 - -actual var s: String = "value" - -fun foo2(): Int = 0 - -actual class Foo3 - -class Foo3 diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt index 2dbec71f725..73d27736950 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt @@ -1,12 +1,12 @@ // MODULE: common // TARGET_PLATFORM: Common -expect class CommonClass { +expect class CommonClass { fun memberFun() val memberProp: Int class Nested inner class Inner -} +} actual class CommonClass { actual fun memberFun() {} actual val memberProp: Int = 42 @@ -14,10 +14,10 @@ actual class CommonClass { actual inner class Inner } -expect fun commonFun() +expect fun commonFun() actual fun commonFun() {} -expect val commonProperty: String +expect val commonProperty: String actual val commonProperty: String get() = "hello" diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt deleted file mode 100644 index 73d27736950..00000000000 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt +++ /dev/null @@ -1,67 +0,0 @@ -// MODULE: common -// TARGET_PLATFORM: Common - -expect class CommonClass { - fun memberFun() - val memberProp: Int - class Nested - inner class Inner -} -actual class CommonClass { - actual fun memberFun() {} - actual val memberProp: Int = 42 - actual class Nested - actual inner class Inner -} - -expect fun commonFun() -actual fun commonFun() {} - -expect val commonProperty: String -actual val commonProperty: String - get() = "hello" - -// MODULE: intermediate()()(common) -// TARGET_PLATFORM: Common - -expect class IntermediateClass { - fun memberFun() - val memberProp: Int - class Nested - inner class Inner -} -actual class IntermediateClass { - actual fun memberFun() {} - actual val memberProp: Int = 42 - actual class Nested - actual inner class Inner -} - -expect fun intermediateFun() -actual fun intermediateFun() {} - -expect val intermediateProperty: String -actual val intermediateProperty: String - get() = "hello" - -// MODULE: main()()(intermediate) - -expect class PlatformClass { - fun memberFun() - val memberProp: Int - class Nested - inner class Inner -} -actual class PlatformClass { - actual fun memberFun() {} - actual val memberProp: Int = 42 - actual class Nested - actual inner class Inner -} - -expect fun platformFun() -actual fun platformFun() {} - -expect val platformProperty: String -actual val platformProperty: String - get() = "hello" diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt index 12387fd63d8..1800c77f35f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt @@ -4,7 +4,7 @@ expect fun parameterCount() fun parameterCount(p: String) {} -expect fun parameterCount2() +expect fun parameterCount2() actual fun parameterCount2(p: String) {} expect fun callableKind(): Int @@ -13,9 +13,9 @@ val callableKind: Int = 1 expect fun typeParameterCount() fun typeParameterCount() {} -expect enum class EnumEntries { +expect enum class EnumEntries { ONE, TWO; -} +} actual enum class EnumEntries { ONE; } diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt deleted file mode 100644 index 1800c77f35f..00000000000 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt +++ /dev/null @@ -1,31 +0,0 @@ -// MODULE: common -// TARGET_PLATFORM: Common - -expect fun parameterCount() -fun parameterCount(p: String) {} - -expect fun parameterCount2() -actual fun parameterCount2(p: String) {} - -expect fun callableKind(): Int -val callableKind: Int = 1 - -expect fun typeParameterCount() -fun typeParameterCount() {} - -expect enum class EnumEntries { - ONE, TWO; -} -actual enum class EnumEntries { - ONE; -} - -expect fun vararg(bar: Int) -fun vararg(vararg bar: Int) = Unit - -// MODULE: main()()(common) - -actual fun parameterCount() {} -actual fun typeParameterCount() {} -actual fun callableKind(): Int = 1 -actual fun vararg(bar: Int) = Unit