Build: remove obsolete compiler arguments

These compiler arguments enable features which are enabled by default in
the current Kotlin anyway.

The only exception is in :compiler:cli which uses an old language
version.

.idea/kotlinc.xml

@@ -13,6 +13,6 @@
     </option>
   </component>
   <component name="KotlinCompilerSettings">
-    <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check -Xread-deserialized-contracts" />
+    <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
   </component>
 </project>

build.gradle.kts

@@ -151,8 +151,6 @@ if (!project.hasProperty("versions.kotlin-native")) {
     extra["versions.kotlin-native"] = "1.6.0-dev-248"
 }
 
-val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
-val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)
 val useJvmFir by extra(project.kotlinBuildProperties.useFir)
 
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
@@ -447,7 +445,6 @@ allprojects {
 
     val commonCompilerArgs = listOfNotNull(
         "-Xopt-in=kotlin.RequiresOptIn",
-        "-Xread-deserialized-contracts",
         "-progressive".takeIf { hasProperty("test.progressive.mode") }
     )
 
@@ -462,8 +459,7 @@ allprojects {
     val jvmCompilerArgs = listOf(
         "-Xjvm-default=compatibility",
         "-Xno-optimized-callable-references",
-        "-Xno-kotlin-nothing-value-exception",
-        "-Xnormalize-constructor-calls=enable"
+        "-Xno-kotlin-nothing-value-exception"
     )
 
     tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
@@ -1135,4 +1131,4 @@ afterEvaluate {
                 "https://cache-redirector.jetbrains.com/github.com/yarnpkg/yarn/releases/download"
         }
     }
-}
+}

compiler/build.gradle.kts

@@ -12,25 +12,6 @@ val otherCompilerModules = compilerModules.filter { it != path }
 
 val tasksWithWarnings: List<String> by rootProject.extra
 
-val effectSystemEnabled: Boolean by rootProject.extra
-val newInferenceEnabled: Boolean by rootProject.extra
-
-configureFreeCompilerArg(effectSystemEnabled, "-Xeffect-system")
-configureFreeCompilerArg(newInferenceEnabled, "-Xnew-inference")
-configureFreeCompilerArg(true, "-Xuse-mixed-named-arguments")
-
-fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
-    if (isEnabled) {
-        allprojects {
-            tasks.withType<KotlinCompile<*>> {
-                kotlinOptions {
-                    freeCompilerArgs += listOf(compilerArgument)
-                }
-            }
-        }
-    }
-}
-
 val antLauncherJar by configurations.creating
 
 dependencies {

compiler/cli/build.gradle.kts

@@ -60,7 +60,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
         languageVersion = "1.3"
         apiVersion = "1.3"
         freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf(
-            "-Xskip-prerelease-check", "-Xsuppress-version-warnings"
+            "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments", "-Xnew-inference"
         )
     }
 }

compiler/fir/tree/build.gradle.kts

@@ -50,12 +50,6 @@ val compileKotlin by tasks
 
 compileKotlin.dependsOn(generateTree)
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xinline-classes"
-    }
-}
-
 if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     apply(plugin = "idea")
     idea {

compiler/ir/serialization.common/build.gradle.kts

@@ -24,7 +24,6 @@ tasks {
     val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
         kotlinOptions {
             freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
-            freeCompilerArgs += "-Xinline-classes"
         }
     }
 }

compiler/tests-common/build.gradle.kts

@@ -74,12 +74,6 @@ dependencies {
     testApiJUnit5()
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xinline-classes"
-    }
-}
-
 sourceSets {
     "main" { }
     "test" { projectDefault() }

gradle.properties

@@ -7,9 +7,6 @@ org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,J
 cacheRedirectorEnabled=true
 defaultSnapshotVersion=1.5.255-SNAPSHOT
 
-kotlin.compiler.effectSystemEnabled=true
-kotlin.compiler.newInferenceEnabled=true
-
 # Enable JVM IR backend for kotlin-stdlib, kotlin-reflect, kotlin-test.
 #kotlin.build.useIRForLibraries=true
 

kotlin-native/Interop/Runtime/build.gradle.kts

@@ -72,10 +72,11 @@ sourceSets.main.get().java.srcDir("src/jvm/kotlin")
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
     kotlinOptions {
-        freeCompilerArgs = listOf("-Xopt-in=kotlin.ExperimentalUnsignedTypes",
-                                  "-Xopt-in=kotlin.RequiresOptIn",
-                                  "-Xinline-classes",
-                                  "-Xskip-prerelease-check")
+        freeCompilerArgs = listOf(
+            "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+            "-Xopt-in=kotlin.RequiresOptIn",
+            "-Xskip-prerelease-check"
+        )
         allWarningsAsErrors = true
     }
 }

kotlin-native/backend.native/build.gradle

@@ -185,12 +185,11 @@ targetList.each { target ->
         args = [*konanArgs,
                 '-output', project(':kotlin-native:runtime').file("build/${target}Stdlib"),
                 '-produce', 'library', '-module-name', 'stdlib',
-                '-Xmulti-platform', '-Xopt-in=kotlin.RequiresOptIn', '-Xinline-classes',
+                '-Xmulti-platform', '-Xopt-in=kotlin.RequiresOptIn',
                 '-Xopt-in=kotlin.contracts.ExperimentalContracts',
                 '-Xopt-in=kotlin.ExperimentalMultiplatform',
                 '-Xopt-in=kotlin.native.internal.InternalForKotlinNative',
                 '-Xopt-in=kotlin.native.SymbolNameIsDeprecated',
-                '-Xallow-result-return-type',
                 *commonSrc.toList(),
                 *testAnnotationCommon.toList(),
                 *testCommon.toList(),

kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle

@@ -96,7 +96,7 @@ targetList.each { target ->
                 '-produce', 'library', '-module-name', moduleName,
                 '-Xmulti-platform', '-Xopt-in=kotlinx.cli.ExperimentalCli',
                 '-Xopt-in=kotlin.ExperimentalMultiplatform',
-                '-Xallow-result-return-type',  '-Werror', '-Xopt-in=kotlin.RequiresOptIn',
+                '-Werror', '-Xopt-in=kotlin.RequiresOptIn',
                 commonSrc.absolutePath,
                 "-Xcommon-sources=${commonSrc.absolutePath}",
                 nativeSrc]

libraries/kotlin.test/js-ir/build.gradle.kts

@@ -49,10 +49,8 @@ kotlin {
 tasks.withType<KotlinCompile<*>>().configureEach {
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xallow-kotlin-package",
-        "-Xallow-result-return-type",
         "-Xopt-in=kotlin.ExperimentalMultiplatform",
-        "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-        "-Xinline-classes"
+        "-Xopt-in=kotlin.contracts.ExperimentalContracts"
     )
 }
 

libraries/kotlin.test/jvm/build.gradle

@@ -43,7 +43,6 @@ configureJavadocJar()
 compileKotlin {
     kotlinOptions.freeCompilerArgs = [
         "-Xallow-kotlin-package",
-        "-Xnormalize-constructor-calls=enable",
         "-Xopt-in=kotlin.contracts.ExperimentalContracts",
         "-Xsuppress-deprecated-jvm-target-warning",
         "-Xopt-in=kotlin.RequiresOptIn",

libraries/reflect/api/build.gradle

@@ -44,13 +44,13 @@ if (includeJava9) {
 
 compileKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-version",
-                            "-Xallow-kotlin-package",
-                            "-Xnormalize-constructor-calls=enable",
-                            "-Xno-optimized-callable-references",
-                            "-Xno-kotlin-nothing-value-exception",
-                            "-Xsuppress-deprecated-jvm-target-warning",
-                            "-Xopt-in=kotlin.RequiresOptIn"]
+        freeCompilerArgs = [
+                "-Xallow-kotlin-package",
+                "-Xno-optimized-callable-references",
+                "-Xno-kotlin-nothing-value-exception",
+                "-Xsuppress-deprecated-jvm-target-warning",
+                "-Xopt-in=kotlin.RequiresOptIn",
+        ]
         moduleName = "kotlin-reflection"
     }
 }

libraries/stdlib/common/build.gradle

@@ -43,9 +43,7 @@ compileKotlinCommon {
                 "-Xopt-in=kotlin.RequiresOptIn",
                 "-Xopt-in=kotlin.ExperimentalMultiplatform",
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                "-Xinline-classes",
                 "-Xallow-kotlin-package",
-                "-Xallow-result-return-type"
         ]
     }
 }

libraries/stdlib/jdk7/build.gradle

@@ -71,7 +71,6 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
-            "-Xnormalize-constructor-calls=enable",
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts",
             "-Xsuppress-deprecated-jvm-target-warning",

libraries/stdlib/jdk8/build.gradle

@@ -59,7 +59,6 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
-            "-Xnormalize-constructor-calls=enable",
     ]
     kotlinOptions.moduleName = project.name
 }

libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts

@@ -121,10 +121,8 @@ kotlin {
 tasks.withType<KotlinCompile<*>> {
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xallow-kotlin-package",
-        "-Xallow-result-return-type",
         "-Xopt-in=kotlin.ExperimentalMultiplatform",
         "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-        "-Xinline-classes",
         "-Xopt-in=kotlin.RequiresOptIn",
         "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
         "-Xopt-in=kotlin.ExperimentalStdlibApi"

libraries/stdlib/js-ir/build.gradle.kts

@@ -137,10 +137,8 @@ kotlin {
 tasks.withType<KotlinCompile<*>>().configureEach {
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xallow-kotlin-package",
-        "-Xallow-result-return-type",
         "-Xopt-in=kotlin.ExperimentalMultiplatform",
         "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-        "-Xinline-classes",
         "-Xopt-in=kotlin.RequiresOptIn",
         "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
         "-Xopt-in=kotlin.ExperimentalStdlibApi"
@@ -169,4 +167,4 @@ val packFullRuntimeKLib by tasks.registering(Jar::class) {
     from(buildDir.resolve("classes/kotlin/js/main"))
     destinationDirectory.set(rootProject.buildDir.resolve("js-ir-runtime"))
     archiveFileName.set("full-runtime.klib")
-}
+}

libraries/stdlib/js-v1/build.gradle

@@ -117,9 +117,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) {
         main = "noCall"
         moduleKind = "commonjs"
         freeCompilerArgs = [
-                "-version",
                 "-Xallow-kotlin-package",
-                "-Xallow-result-return-type"
         ]
     }
 }
@@ -143,7 +141,6 @@ compileKotlin2Js {
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.ExperimentalMultiplatform",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-            "-Xinline-classes"
         ]
     }
 }

libraries/stdlib/jvm/build.gradle

@@ -115,15 +115,11 @@ DexMethodCountKt.dexMethodCount(project) { task ->
 compileKotlin {
     kotlinOptions {
         freeCompilerArgs = [
-                "-version",
                 "-Xallow-kotlin-package",
-                "-Xallow-result-return-type",
                 "-Xmultifile-parts-inherit",
-                "-Xnormalize-constructor-calls=enable",
                 "-Xopt-in=kotlin.RequiresOptIn",
                 "-Xopt-in=kotlin.ExperimentalMultiplatform",
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                "-Xinline-classes",
                 "-Xuse-14-inline-classes-mangling-scheme",
                 "-Xsuppress-deprecated-jvm-target-warning",
         ]

libraries/stdlib/wasm/build.gradle.kts

@@ -73,10 +73,8 @@ tasks.withType<KotlinCompile<*>>().configureEach {
 
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xallow-kotlin-package",
-        "-Xallow-result-return-type",
         "-Xopt-in=kotlin.ExperimentalMultiplatform",
         "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-        "-Xinline-classes",
         "-Xopt-in=kotlin.RequiresOptIn",
         "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
         "-Xopt-in=kotlin.ExperimentalStdlibApi"

libraries/tools/binary-compatibility-validator/build.gradle

@@ -28,12 +28,6 @@ sourceSets {
     }
 }
 
-compileTestKotlin {
-    kotlinOptions {
-        freeCompilerArgs = ["-Xnormalize-constructor-calls=enable"]
-    }
-}
-
 test {
     dependsOn configurations.testArtifacts
 

libraries/tools/kotlin-annotations-jvm/build.gradle

@@ -25,7 +25,6 @@ configureJavadocJar()
 compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
-            "-Xnormalize-constructor-calls=enable",
     ]
     kotlinOptions.moduleName = project.name
 }

libraries/tools/script-runtime/build.gradle

@@ -37,7 +37,6 @@ configureJavadocJar()
 compileKotlin {
     kotlinOptions.freeCompilerArgs = [
         "-Xallow-kotlin-package",
-        "-Xnormalize-constructor-calls=enable",
         "-Xsuppress-deprecated-jvm-target-warning",
     ]
     kotlinOptions.moduleName = project.name