[K2] Report NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION when it is appropriate

compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.fir.kt

@@ -2,11 +2,11 @@ val nonConstBool = true
 const val constBool = false
 
 const val andExpr1 = true && false
-const val andExpr2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool && false<!>
+const val andExpr2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool && false<!>
 const val andExpr3 = true && constBool
-const val andExpr4 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool && constBool<!>
+const val andExpr4 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool && constBool<!>
 
 const val orExpr1 = true || false
-const val orExpr2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool || false<!>
+const val orExpr2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool || false<!>
 const val orExpr3 = true || constBool
-const val orExpr4 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool || constBool<!>
+const val orExpr4 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool || constBool<!>

compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.fir.kt

@@ -4,5 +4,5 @@ val nonConstBool = true
 const val constBool = false
 
 const val s1 = """ ${ true && false } """
-const val s2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>""" ${ nonConstBool && false } """<!>
+const val s2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>""" ${ nonConstBool && false } """<!>
 const val s3 = """ ${ constBool && false } """

compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.fir.kt

@@ -1,8 +0,0 @@
-// LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
-
-val nonConstBool = true
-const val constBool = false
-
-const val s1 = """ ${ true && false } """
-const val s2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>""" ${ nonConstBool && false } """<!>
-const val s3 = """ ${ constBool && false } """

compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
 
 val nonConstBool = true

compiler/testData/diagnostics/tests/modifiers/const/ifConstVal_after.fir.kt

@@ -20,5 +20,5 @@ const val withWhen3 = when(value) {
 const val multibranchIf = if (value == 100) 1 else if (value == 1000) 2 else 3
 
 val nonConstFlag = true
-const val errorConstIf = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>if (nonConstFlag) 1 else 2<!>
-const val errorBranch = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>if (flag) nonConstFlag else false<!>
+const val errorConstIf = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>if (nonConstFlag) 1 else 2<!>
+const val errorBranch = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>if (flag) nonConstFlag else false<!>

compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.fir.kt

@@ -1,16 +0,0 @@
-const val simple = "O${'K'} ${1.toLong() + 2.0}"
-const val withInnerConcatenation = "1 ${"2 ${3} ${4} 5"} 6"
-
-object A
-object B {
-    override fun toString(): String = "B"
-}
-
-const val printA = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>"A: $A"<!>
-const val printB = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>"B: $B"<!>
-
-const val withNull = "1 ${null}"
-const val withNullPlus = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>"1" + null<!>
-
-val nonConst = 0
-const val withNonConst = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>"A $nonConst B"<!>

compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 const val simple = "O${'K'} ${1.toLong() + 2.0}"
 const val withInnerConcatenation = "1 ${"2 ${3} ${4} 5"} 6"
 

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.fir.kt

@@ -1,16 +0,0 @@
-val nonConst = 1
-
-const val constConst = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConst * nonConst + 2<!>
-
-annotation class Ann(val x: Int, val y: String)
-
-@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst<!>, <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>"${nonConst}"<!>)
-fun foo1() {}
-
-@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst + constConst<!>, "${constConst}")
-fun foo2() {}
-
-annotation class ArrayAnn(val x: IntArray)
-
-@ArrayAnn(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>intArrayOf(1, constConst, <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst<!>)<!>)
-fun foo3() {}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 val nonConst = 1
 
 const val constConst = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst * nonConst + 2<!>