From 606ae45f5f6e9e3fd94b4bd11739eee9da255d69 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 10 Feb 2021 10:40:01 +0300 Subject: [PATCH] [Test] Replace remaining `KOTLIN_CONFIGURATION_FLAGS` directives with specific ones --- .../test/directives/LanguageSettingsDirectives.kt | 6 ++++++ .../codegen/box/annotations/divisionByZeroInJava.kt | 2 +- .../annotations/typeAnnotations/implicitReturn.kt | 2 +- .../typeAnnotations/implicitReturnAgainstCompiled.kt | 2 +- .../box/annotations/typeAnnotations/kt41484.kt | 2 +- .../annotations/typeAnnotations/methodParameters.kt | 2 +- .../typeAnnotations/typeAnnotationTarget6.kt | 2 +- .../annotations/typeAnnotations/typeUseAnnotation.kt | 2 +- ...daptedReferencesIfNoOptimizedReferencesEnabled.kt | 2 +- .../typeAnnotations/implicitReturn.kt | 2 +- .../funInterface/noOptimizedCallableReferences.kt | 2 +- .../codegen/box/notNullAssertions/callAssertions.kt | 2 +- .../notNullAssertions/doGenerateParamAssertions.kt | 2 +- .../box/notNullAssertions/noCallAssertions.kt | 3 ++- .../nullCheckOptimization/exclExclThrowsKnpe_1_3.kt | 2 +- .../javaNullCheckThrowsIse_1_3.kt | 2 +- .../parameterNullCheckThrowsIae_1_3.kt | 2 +- .../codegen/box/parametersMetadata/defaultImpls.kt | 4 ++-- .../codegen/box/parametersMetadata/delegation.kt | 2 +- .../testData/codegen/box/parametersMetadata/enum.kt | 4 ++-- .../box/parametersMetadata/extensionFunction.kt | 4 ++-- .../codegen/box/parametersMetadata/function.kt | 4 ++-- .../inlineClassMethodParameterModifiers.kt | 4 ++-- .../inlineClassMethodParameterNames.kt | 4 ++-- .../codegen/box/parametersMetadata/innerClass.kt | 4 ++-- .../codegen/box/parametersMetadata/superParams.kt | 4 ++-- .../box/parametersMetadata/suspendFunction.kt | 2 +- .../boxInline/reified/checkCast/simple_1_3.kt | 2 +- .../configuration/JvmEnvironmentConfigurator.kt | 12 ++++++++++++ 29 files changed, 54 insertions(+), 35 deletions(-) diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt index 36e21b29d5d..5186b68ab8f 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt +++ b/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 --------------------- diff --git a/compiler/testData/codegen/box/annotations/divisionByZeroInJava.kt b/compiler/testData/codegen/box/annotations/divisionByZeroInJava.kt index 9efe9d0b395..bab5445979f 100644 --- a/compiler/testData/codegen/box/annotations/divisionByZeroInJava.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturn.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturn.kt index 6023ecf9244..a121fa9b997 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturn.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturnAgainstCompiled.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturnAgainstCompiled.kt index f59f598b264..2da713e5688 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/implicitReturnAgainstCompiled.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt index 73e2000475f..8830ea504cb 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/kt41484.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/methodParameters.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/methodParameters.kt index f7ee4f6423d..04a4d9a1cb5 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/methodParameters.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/typeAnnotationTarget6.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/typeAnnotationTarget6.kt index a849dfc7adb..a882e99ff8f 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/typeAnnotationTarget6.kt +++ b/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 diff --git a/compiler/testData/codegen/box/annotations/typeAnnotations/typeUseAnnotation.kt b/compiler/testData/codegen/box/annotations/typeAnnotations/typeUseAnnotation.kt index a9f24c24c2d..40aec28cc1a 100644 --- a/compiler/testData/codegen/box/annotations/typeAnnotations/typeUseAnnotation.kt +++ b/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 diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/noAdaptedReferencesIfNoOptimizedReferencesEnabled.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/noAdaptedReferencesIfNoOptimizedReferencesEnabled.kt index 231cd324f84..7cf551ee397 100644 --- a/compiler/testData/codegen/box/callableReference/adaptedReferences/noAdaptedReferencesIfNoOptimizedReferencesEnabled.kt +++ b/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 diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt index 22192d5c3b9..a3810a8b2bc 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt +++ b/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 diff --git a/compiler/testData/codegen/box/funInterface/noOptimizedCallableReferences.kt b/compiler/testData/codegen/box/funInterface/noOptimizedCallableReferences.kt index 91f6cd5af8f..d54b147db33 100644 --- a/compiler/testData/codegen/box/funInterface/noOptimizedCallableReferences.kt +++ b/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 diff --git a/compiler/testData/codegen/box/notNullAssertions/callAssertions.kt b/compiler/testData/codegen/box/notNullAssertions/callAssertions.kt index 6f7e7530a4a..d89575fa449 100644 --- a/compiler/testData/codegen/box/notNullAssertions/callAssertions.kt +++ b/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 diff --git a/compiler/testData/codegen/box/notNullAssertions/doGenerateParamAssertions.kt b/compiler/testData/codegen/box/notNullAssertions/doGenerateParamAssertions.kt index 0720bcb81d0..9dbadc6e9cb 100644 --- a/compiler/testData/codegen/box/notNullAssertions/doGenerateParamAssertions.kt +++ b/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; diff --git a/compiler/testData/codegen/box/notNullAssertions/noCallAssertions.kt b/compiler/testData/codegen/box/notNullAssertions/noCallAssertions.kt index df29dc2408b..14e450c29b2 100644 --- a/compiler/testData/codegen/box/notNullAssertions/noCallAssertions.kt +++ b/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 diff --git a/compiler/testData/codegen/box/nullCheckOptimization/exclExclThrowsKnpe_1_3.kt b/compiler/testData/codegen/box/nullCheckOptimization/exclExclThrowsKnpe_1_3.kt index d562f04c1ee..54063d52397 100644 --- a/compiler/testData/codegen/box/nullCheckOptimization/exclExclThrowsKnpe_1_3.kt +++ b/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 diff --git a/compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsIse_1_3.kt b/compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsIse_1_3.kt index 72131e10f67..302bc34812a 100644 --- a/compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsIse_1_3.kt +++ b/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 diff --git a/compiler/testData/codegen/box/nullCheckOptimization/parameterNullCheckThrowsIae_1_3.kt b/compiler/testData/codegen/box/nullCheckOptimization/parameterNullCheckThrowsIae_1_3.kt index 82258a5c33c..5102b9e355b 100644 --- a/compiler/testData/codegen/box/nullCheckOptimization/parameterNullCheckThrowsIae_1_3.kt +++ b/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 diff --git a/compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt b/compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt index fb669181576..855d9314608 100644 --- a/compiler/testData/codegen/box/parametersMetadata/defaultImpls.kt +++ b/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 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/delegation.kt b/compiler/testData/codegen/box/parametersMetadata/delegation.kt index d1635e5111d..e740188f137 100644 --- a/compiler/testData/codegen/box/parametersMetadata/delegation.kt +++ b/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 diff --git a/compiler/testData/codegen/box/parametersMetadata/enum.kt b/compiler/testData/codegen/box/parametersMetadata/enum.kt index 4008e1dfa34..2693b9becff 100644 --- a/compiler/testData/codegen/box/parametersMetadata/enum.kt +++ b/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 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt b/compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt index 4f76781e1c7..f98eea2dc29 100644 --- a/compiler/testData/codegen/box/parametersMetadata/extensionFunction.kt +++ b/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 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/function.kt b/compiler/testData/codegen/box/parametersMetadata/function.kt index fb989de805a..8bbf65d0a7c 100644 --- a/compiler/testData/codegen/box/parametersMetadata/function.kt +++ b/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 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterModifiers.kt b/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterModifiers.kt index 1759e684870..f73e51561b0 100644 --- a/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterModifiers.kt +++ b/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" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterNames.kt b/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterNames.kt index 92a2fd71951..13c029ef9a2 100644 --- a/compiler/testData/codegen/box/parametersMetadata/inlineClassMethodParameterNames.kt +++ b/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" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/innerClass.kt b/compiler/testData/codegen/box/parametersMetadata/innerClass.kt index 7d6d6cd9ef9..b68f41b0b2d 100644 --- a/compiler/testData/codegen/box/parametersMetadata/innerClass.kt +++ b/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" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/superParams.kt b/compiler/testData/codegen/box/parametersMetadata/superParams.kt index 3441bcdde9f..56aabbb4458 100644 --- a/compiler/testData/codegen/box/parametersMetadata/superParams.kt +++ b/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 -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt b/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt index b79a3386c7b..4a020ea1cec 100644 --- a/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt +++ b/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.* diff --git a/compiler/testData/codegen/boxInline/reified/checkCast/simple_1_3.kt b/compiler/testData/codegen/boxInline/reified/checkCast/simple_1_3.kt index ab0a88e0b46..ffea2f99c22 100644 --- a/compiler/testData/codegen/boxInline/reified/checkCast/simple_1_3.kt +++ b/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 diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index b5f5ef10e39..a65e0ed2eb9 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/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) {