From 705b2e87fd307707fd8cb311d78d00d70606b6ca Mon Sep 17 00:00:00 2001
From: Roman Efremov <roman.efremov@jetbrains.com>
Date: Thu, 21 Sep 2023 12:44:43 +0200
Subject: [PATCH] Revert "[K2] Temporary mute
 ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE"

This reverts commit b232dbf484de0fa93ab2b679a6c69bd82d9dab62.
---
 ...nConflictingDefaultArgumentValueChecker.kt |  4 +--
 .../defaultArguments/annotations.fir.kt       | 32 -------------------
 .../defaultArguments/annotations.kt           |  1 +
 .../annotationsViaActualTypeAlias.fir.kt      |  2 +-
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete 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 eeea83dafcf..a37a267b59c 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,15 +36,13 @@ internal object IrExpectActualAnnotationConflictingDefaultArgumentValueChecker :
                             ExpectActualCollectionArgumentsCompatibilityCheckStrategy.Default
                         )
                     ) {
-                        // TODO(Roman.Efremov): KT-62104 fix failing tests and unmute
-                        // reportError(expectClass, actualDefaultValue, actualParam)
+                        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
deleted file mode 100644
index d91f570f99e..00000000000
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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 948d3374e8f..e06dfd57f0e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.kt
@@ -1,3 +1,4 @@
+// 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 4aadc9bd854..564fefc15a3 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_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE!>actual typealias A5 = J5<!>
 
 // FILE: J1.java