[Test] Replace remaining KOTLIN_CONFIGURATION_FLAGS directives with specific ones

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt

@@ -68,6 +68,12 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() {
     )
 
     val ENABLE_JVM_PREVIEW by directive("Enable JVM preview features")
+    val EMIT_JVM_TYPE_ANNOTATIONS by directive("Enable emitting jvm type annotations")
+    val NO_OPTIMIZED_CALLABLE_REFERENCES by directive("Don't optimize callable references")
+    val DISABLE_PARAM_ASSERTIONS by directive("Disable assertions on parameters")
+    val DISABLE_CALL_ASSERTIONS by directive("Disable assertions on calls")
+    val NO_UNIFIED_NULL_CHECKS by directive("No unified null checks")
+    val PARAMETERS_METADATA by directive("Add parameters metadata for 1.8 reflection")
 
     // --------------------- Utils ---------------------
 

compiler/testData/codegen/box/annotations/divisionByZeroInJava.kt

@@ -1,5 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: JS JS_IR JS_IR_ES6 WASM NATIVE
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_PSI_CLASS_FILES_READING
+// USE_PSI_CLASS_FILES_READING
 // MODULE: lib
 // FILE: J.java
 

compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturn.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND_FIR: JVM_IR
 // JVM_TARGET: 1.8

compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturnAgainstCompiled.kt

@@ -1,5 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: JS JS_IR JS_IR_ES6 WASM NATIVE
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND_FIR: JVM_IR
 // JVM_TARGET: 1.8

compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // FULL_JDK

compiler/testData/codegen/box/annotations/typeAnnotations/methodParameters.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8

compiler/testData/codegen/box/annotations/typeAnnotations/typeAnnotationTarget6.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 
 // No virtual method getAnnotatedReturnType()Ljava/lang/reflect/AnnotatedType

compiler/testData/codegen/box/annotations/typeAnnotations/typeUseAnnotation.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_REFLECT

compiler/testData/codegen/box/callableReference/adaptedReferences/noAdaptedReferencesIfNoOptimizedReferencesEnabled.kt

@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_OPTIMIZED_CALLABLE_REFERENCES
+// NO_OPTIMIZED_CALLABLE_REFERENCES
 
 class A {
     fun target(): Int = 42

compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt

@@ -1,5 +1,5 @@
 // IGNORE_BACKEND_FIR: JVM_IR
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// EMIT_JVM_TYPE_ANNOTATIONS
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_REFLECT

compiler/testData/codegen/box/funInterface/noOptimizedCallableReferences.kt

@@ -1,6 +1,6 @@
 // DONT_TARGET_EXACT_BACKEND: WASM
 // WASM_MUTE_REASON: SAM_CONVERSIONS
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_OPTIMIZED_CALLABLE_REFERENCES
+// NO_OPTIMIZED_CALLABLE_REFERENCES
 
 fun interface P {
     fun get(): String

compiler/testData/codegen/box/notNullAssertions/callAssertions.kt

@@ -1,6 +1,6 @@
 // DONT_TARGET_EXACT_BACKEND: JS JS_IR JS_IR_ES6 WASM NATIVE
 // IGNORE_BACKEND_FIR: JVM_IR
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.DISABLE_PARAM_ASSERTIONS
+// DISABLE_PARAM_ASSERTIONS
 
 // MODULE: lib
 // FILE: A.java

compiler/testData/codegen/box/notNullAssertions/doGenerateParamAssertions.kt

@@ -1,5 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: JS JS_IR JS_IR_ES6 WASM NATIVE
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.DISABLE_CALL_ASSERTIONS
+// DISABLE_CALL_ASSERTIONS
 // MODULE: lib
 // FILE: C.java
 package test;

compiler/testData/codegen/box/notNullAssertions/noCallAssertions.kt

@@ -1,5 +1,6 @@
 // DONT_TARGET_EXACT_BACKEND: JS JS_IR JS_IR_ES6 WASM NATIVE
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.DISABLE_PARAM_ASSERTIONS, +JVM.DISABLE_CALL_ASSERTIONS
+// DISABLE_PARAM_ASSERTIONS
+// DISABLE_CALL_ASSERTIONS
 
 // MODULE: lib
 // FILE: A.java

compiler/testData/codegen/box/nullCheckOptimization/exclExclThrowsKnpe_1_3.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_UNIFIED_NULL_CHECKS
+// NO_UNIFIED_NULL_CHECKS
 // WITH_RUNTIME
 // TARGET_BACKEND: JVM
 

compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsIse_1_3.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_UNIFIED_NULL_CHECKS
+// NO_UNIFIED_NULL_CHECKS
 // TARGET_BACKEND: JVM
 // FILE: A.java
 

compiler/testData/codegen/box/nullCheckOptimization/parameterNullCheckThrowsIae_1_3.kt

@@ -1,4 +1,4 @@
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_UNIFIED_NULL_CHECKS
+// NO_UNIFIED_NULL_CHECKS
 // TARGET_BACKEND: JVM
 // FILE: A.java
 

compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 interface Test {
     fun test(OK: String) = "123"
@@ -18,4 +18,4 @@ fun box(): String {
     if (parameters[1].modifiers != 0) return "wrong modifier on value parameter: ${parameters[1].modifiers}"
 
     return parameters[1].name
-}
+}

compiler/testData/codegen/box/parametersMetadata/delegation.kt

@@ -2,7 +2,7 @@
 // WITH_RUNTIME
 // FULL_JDK
 // JAVAC_OPTIONS: -parameters
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 // JVM_TARGET: 1.8
 // FILE: JavaInterface.java
 

compiler/testData/codegen/box/parametersMetadata/enum.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 enum class A(val OK: String) {
 
@@ -21,4 +21,4 @@ fun box(): String {
 
     if (parameters[2].modifiers != 0) return "wrong modifier on value parameter: ${parameters[2].modifiers}"
     return parameters[2].name
-}
+}

compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 class A() {
     fun String.test(OK: String) {
@@ -18,4 +18,4 @@ fun box(): String {
     if (!parameters[0].isImplicit() || parameters[0].isSynthetic()) return "wrong modifier on receiver parameter: ${parameters[0].modifiers}"
 
     return parameters[1].name
-}
+}

compiler/testData/codegen/box/parametersMetadata/function.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 class A() {
     fun test(OK: String) {
@@ -17,4 +17,4 @@ fun box(): String {
 
     if (parameters[0].modifiers != 0) return "wrong modifier on value parameter: ${parameters[0].modifiers}"
     return parameters[0].name
-}
+}

compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterModifiers.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 // FILE: A.kt
 
@@ -25,4 +25,4 @@ fun box(): String {
         return "wrong modifier (not implicit) on extension receiver parameter: ${extensionMethodParameters[0].modifiers}"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterNames.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 // FILE: A.kt
 
@@ -24,4 +24,4 @@ fun box(): String {
         return "wrong name on extension receiver parameter: ${extensionMethodParameters[0].name}"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/parametersMetadata/innerClass.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 class A {
     inner class B
@@ -17,4 +17,4 @@ fun box(): String {
     if (!parameters[0].isImplicit() || parameters[0].isSynthetic()) return "wrong outer flags: ${parameters[0].modifiers}"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/parametersMetadata/superParams.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 
 open class A(val s: String)
 
@@ -17,4 +17,4 @@ fun box(): String {
 
     if (!parameters[0].isSynthetic()  || parameters[0].isImplicit()) return "wrong modifier on value parameter: ${parameters[0].modifiers}"
     return value.s
-}
+}

compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA
+// PARAMETERS_METADATA
 import kotlin.coroutines.*
 import kotlin.coroutines.intrinsics.*
 

compiler/testData/codegen/boxInline/reified/checkCast/simple_1_3.kt

@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_UNIFIED_NULL_CHECKS
+// NO_UNIFIED_NULL_CHECKS
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 package test

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt

@@ -25,7 +25,13 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SAM_CONVERSIONS
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.STRING_CONCAT
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.DISABLE_CALL_ASSERTIONS
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.DISABLE_PARAM_ASSERTIONS
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.EMIT_JVM_TYPE_ANNOTATIONS
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.ENABLE_JVM_PREVIEW
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_OPTIMIZED_CALLABLE_REFERENCES
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIED_NULL_CHECKS
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
 import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
@@ -61,6 +67,12 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
         register(LAMBDAS, JVMConfigurationKeys.LAMBDAS)
         register(USE_OLD_INLINE_CLASSES_MANGLING_SCHEME, JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME)
         register(ENABLE_JVM_PREVIEW, JVMConfigurationKeys.ENABLE_JVM_PREVIEW)
+        register(EMIT_JVM_TYPE_ANNOTATIONS, JVMConfigurationKeys.EMIT_JVM_TYPE_ANNOTATIONS)
+        register(NO_OPTIMIZED_CALLABLE_REFERENCES, JVMConfigurationKeys.NO_OPTIMIZED_CALLABLE_REFERENCES)
+        register(DISABLE_PARAM_ASSERTIONS, JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS)
+        register(DISABLE_CALL_ASSERTIONS, JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS)
+        register(NO_UNIFIED_NULL_CHECKS, JVMConfigurationKeys.NO_UNIFIED_NULL_CHECKS)
+        register(PARAMETERS_METADATA, JVMConfigurationKeys.PARAMETERS_METADATA)
     }
 
     override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {