Constructor call normalization mode depends on language version

compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt

@@ -229,10 +229,13 @@ class GenerationState private constructor(
 
     val shouldInlineConstVals = languageVersionSettings.supportsFeature(LanguageFeature.InlineConstVals)
 
-    val constructorCallNormalizationMode = configuration.get(
+    val constructorCallNormalizationMode =
-        JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE,
+        configuration.get(JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE) ?: run {
-        JVMConstructorCallNormalizationMode.DEFAULT
+            if (languageVersionSettings.supportsFeature(LanguageFeature.NormalizeConstructorCalls))
-    )
+                JVMConstructorCallNormalizationMode.ENABLE
+            else
+                JVMConstructorCallNormalizationMode.DISABLE
+        }
 
     val jvmDefaultMode = languageVersionSettings.getFlag(AnalysisFlag.jvmDefaultMode)
 

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 =
+            if (!JVMConstructorCallNormalizationMode.isSupportedValue(arguments.constructorCallNormalizationMode)) {
-                JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
-            if (constructorCallNormalizationMode == null) {
                 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,
+            val constructorCallNormalizationMode =
-                constructorCallNormalizationMode ?: JVMConstructorCallNormalizationMode.DEFAULT
+                JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
-            )
+            if (constructorCallNormalizationMode != null) {
+                configuration.put(
+                    JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE,
+                    constructorCallNormalizationMode
+                )
+            }
 
             val assertionsMode =
                 JVMAssertionsMode.fromStringOrNull(arguments.assertionsMode)

compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt

@@ -17,9 +17,9 @@
 package org.jetbrains.kotlin.config
 
 enum class JVMConstructorCallNormalizationMode(
-        val description: String,
+    val description: String,
-        val isEnabled: Boolean,
+    val isEnabled: Boolean,
-        val shouldPreserveClassInitialization: Boolean
+    val shouldPreserveClassInitialization: Boolean
 ) {
     DISABLE("disable", false, false),
     ENABLE("enable", true, false),
@@ -27,10 +27,12 @@ enum class JVMConstructorCallNormalizationMode(
     ;
 
     companion object {
-        @JvmField
+        @JvmStatic
-        val DEFAULT = DISABLE
+        fun isSupportedValue(string: String?) =
+            string == null || values().any { it.description == string }
 
         @JvmStatic
-        fun fromStringOrNull(string: String?) = values().find { it.description == string }
+        fun fromStringOrNull(string: String?) =
+            values().find { it.description == string }
     }
 }

compiler/testData/codegen/box/constructorCall/breakInConstructorArguments.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/constructorCall/continueInConstructorArguments.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/constructorCall/earlyReturnInConstructorArguments.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 inline fun ok(): String {

compiler/testData/codegen/box/constructorCall/inlineFunInConstructorCallEvaluationOrder.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/constructorCall/inlineFunInInnerClassConstructorCall.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/constructorCall/inlineFunInLocalClassConstructorCall.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME

compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt

@@ -0,0 +1,15 @@
+// !LANGUAGE: +NormalizeConstructorCalls
+// IGNORE_BACKEND: JVM_IR
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+open class A(val s: String)
+
+inline fun test(crossinline z: () -> String): String {
+    return object : A(listOf(1).map { it.toString() }.joinToString()) {
+        val value = z()
+    }.value
+}
+
+fun box(): String {
+    return test { "OK" }
+}

compiler/testData/codegen/box/constructorCall/nonLocalReturnInConstructorArguments.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/constructorCall/tryCatchInConstructorCallEvaluationOrder.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -NormalizeConstructorCalls
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java

@@ -243,7 +243,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
 
     private static final Pattern BOOLEAN_FLAG_PATTERN = Pattern.compile("([+-])(([a-zA-Z_0-9]*)\\.)?([a-zA-Z_0-9]*)");
     private static final Pattern CONSTRUCTOR_CALL_NORMALIZATION_MODE_FLAG_PATTERN = Pattern.compile(
-            "CONSTRUCTOR_CALL_NORMALIZATION_MODE=([a-zA-Z_0-9]*)");
+            "CONSTRUCTOR_CALL_NORMALIZATION_MODE=([a-zA-Z_\\-0-9]*)");
     private static final Pattern ASSERTIONS_MODE_FLAG_PATTERN = Pattern.compile("ASSERTIONS_MODE=([a-zA-Z_0-9-]*)");
 
     private static void updateConfigurationWithFlags(@NotNull CompilerConfiguration configuration, @NotNull List<String> flags) {

compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -4215,6 +4215,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalization.kt");
         }
 
+        @TestMetadata("loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt")
+        public void testLoopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13() throws Exception {
+            runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt");
+        }
+
         @TestMetadata("loopInInlineFunWithEnabledNormalization.kt")
         public void testLoopInInlineFunWithEnabledNormalization() throws Exception {
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunWithEnabledNormalization.kt");

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -4215,6 +4215,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalization.kt");
         }
 
+        @TestMetadata("loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt")
+        public void testLoopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13() throws Exception {
+            runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt");
+        }
+
         @TestMetadata("loopInInlineFunWithEnabledNormalization.kt")
         public void testLoopInInlineFunWithEnabledNormalization() throws Exception {
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunWithEnabledNormalization.kt");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -4215,6 +4215,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalization.kt");
         }
 
+        @TestMetadata("loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt")
+        public void testLoopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13() throws Exception {
+            runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt");
+        }
+
         @TestMetadata("loopInInlineFunWithEnabledNormalization.kt")
         public void testLoopInInlineFunWithEnabledNormalization() throws Exception {
             runTest("compiler/testData/codegen/box/constructorCall/loopInInlineFunWithEnabledNormalization.kt");

compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt

@@ -82,6 +82,7 @@ enum class LanguageFeature(
     FunctionTypesWithBigArity(KOTLIN_1_3, sinceApiVersion = ApiVersion.KOTLIN_1_3),
     RestrictRetentionForExpressionAnnotations(KOTLIN_1_3, kind = BUG_FIX),
     NoConstantValueAttributeForNonConstVals(KOTLIN_1_3, kind = BUG_FIX),
+    NormalizeConstructorCalls(KOTLIN_1_3),
 
     RestrictReturnStatementTarget(KOTLIN_1_4, kind = BUG_FIX),