From b232dbf484de0fa93ab2b679a6c69bd82d9dab62 Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Thu, 21 Sep 2023 10:51:14 +0200 Subject: [PATCH] [K2] Temporary mute ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE ...until tests fixed. Mute on TC is not enough because user projects compilation are affected. ^KT-62104 --- ...nConflictingDefaultArgumentValueChecker.kt | 4 ++- .../defaultArguments/annotations.fir.kt | 32 +++++++++++++++++++ .../defaultArguments/annotations.kt | 1 - .../annotationsViaActualTypeAlias.fir.kt | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/checker/IrExpectActualAnnotationConflictingDefaultArgumentValueChecker.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/checker/IrExpectActualAnnotationConflictingDefaultArgumentValueChecker.kt index a37a267b59c..eeea83dafcf 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/checker/IrExpectActualAnnotationConflictingDefaultArgumentValueChecker.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/checker/IrExpectActualAnnotationConflictingDefaultArgumentValueChecker.kt @@ -36,13 +36,15 @@ internal object IrExpectActualAnnotationConflictingDefaultArgumentValueChecker : ExpectActualCollectionArgumentsCompatibilityCheckStrategy.Default ) ) { - reportError(expectClass, actualDefaultValue, actualParam) + // TODO(Roman.Efremov): KT-62104 fix failing tests and unmute + // reportError(expectClass, actualDefaultValue, actualParam) } } } } } + @Suppress("unused") private fun IrExpectActualChecker.Context.reportError( expectAnnotationClass: IrClass, actualDefaultValue: IrExpression, diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt new file mode 100644 index 00000000000..d91f570f99e --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt @@ -0,0 +1,32 @@ +// MODULE: m1-common +// FILE: common.kt + +expect annotation class A1(val x: Int, val y: String = "OK") + +expect annotation class A2(val x: Int = 42, val y: String = "OK") + +expect annotation class A3(val x: Int, val y: String) + +expect annotation class A4(val x: Int = 42, val y: String) + +expect annotation class A5(val x: Int = 42, val y: String) + +@A1(0) +@A2 +@A3(0, "") +@A4(0, "") +@A5(0, "") +fun test() {} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt + +actual annotation class A1(actual val x: Int, actual val y: String) + +actual annotation class A2(actual val x: Int, actual val y: String = "OK") + +actual annotation class A3(actual val x: Int = 42, actual val y: String = "OK") + +actual annotation class A4(actual val x: Int, actual val y: String = "OK") + +actual annotation class A5(actual val x: Int = 239, actual val y: String = "OK") diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt index e06dfd57f0e..948d3374e8f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt index 564fefc15a3..4aadc9bd854 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt @@ -25,7 +25,7 @@ actual typealias A1 = J1 actual typealias A2 = J2 actual typealias A3 = J3 actual typealias A4 = J4 -actual typealias A5 = J5 +actual typealias A5 = J5 // FILE: J1.java