Constructor call normalization mode depends on language version

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt

@@ -112,7 +112,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
         valueDescription = "{disable|enable}",
         description = "Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable"
     )
-    var constructorCallNormalizationMode: String? by FreezableVar(JVMConstructorCallNormalizationMode.DEFAULT.description)
+    var constructorCallNormalizationMode: String? by FreezableVar(null)
 
     @Argument(
         value = "-Xassertions", valueDescription = "{always-enable|always-disable|jvm|legacy}",

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt

@@ -359,19 +359,22 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             )
             configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize)
 
-            val constructorCallNormalizationMode =
-                JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
-            if (constructorCallNormalizationMode == null) {
+            if (!JVMConstructorCallNormalizationMode.isSupportedValue(arguments.constructorCallNormalizationMode)) {
                 configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY).report(
                     ERROR,
                     "Unknown constructor call normalization mode: ${arguments.constructorCallNormalizationMode}, " +
                             "supported modes: ${JVMConstructorCallNormalizationMode.values().map { it.description }}"
                 )
             }
-            configuration.put(
-                JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE,
-                constructorCallNormalizationMode ?: JVMConstructorCallNormalizationMode.DEFAULT
-            )
+
+            val constructorCallNormalizationMode =
+                JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
+            if (constructorCallNormalizationMode != null) {
+                configuration.put(
+                    JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE,
+                    constructorCallNormalizationMode
+                )
+            }
 
             val assertionsMode =
                 JVMAssertionsMode.fromStringOrNull(arguments.assertionsMode)