Don't apply language feature IrInlinerBeforeKlibSerialization to JV…

…M backend ^KT-69765 Fixed Merge-request: KT-MR-18250 Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
JetBrains · Oct 4, 2024 · 78af239 · 78af239
1 parent 888c18a
commit 78af239
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/...mon/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt b/...mon/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt
@@ -41,7 +41,6 @@ fun copyCommonCompilerArguments(from: CommonCompilerArguments, to: CommonCompile
     to.inferenceCompatibility = from.inferenceCompatibility
     to.inlineClasses = from.inlineClasses
     to.intellijPluginRoot = from.intellijPluginRoot
-    to.irInlinerBeforeKlibSerialization = from.irInlinerBeforeKlibSerialization
     to.kotlinHome = from.kotlinHome
     to.languageVersion = from.languageVersion
     to.legacySmartCastAfterTry = from.legacySmartCastAfterTry

diff --git a/...rg/jetbrains/kotlin/cli/common/arguments/CommonKlibBasedCompilerArgumentsCopyGenerated.kt b/...rg/jetbrains/kotlin/cli/common/arguments/CommonKlibBasedCompilerArgumentsCopyGenerated.kt
@@ -12,6 +12,7 @@ fun copyCommonKlibBasedCompilerArguments(from: CommonKlibBasedCompilerArguments,
 
     to.duplicatedUniqueNameStrategy = from.duplicatedUniqueNameStrategy
     to.enableSignatureClashChecks = from.enableSignatureClashChecks
+    to.irInlinerBeforeKlibSerialization = from.irInlinerBeforeKlibSerialization
     to.noDoubleInlining = from.noDoubleInlining
     to.normalizeAbsolutePath = from.normalizeAbsolutePath
     to.partialLinkageLogLevel = from.partialLinkageLogLevel

diff --git a/...r/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/...r/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -813,16 +813,6 @@ The corresponding calls' declarations may not be marked with @BuilderInference."
             field = value
         }
 
-    @Argument(
-        value = "-Xklib-ir-inliner",
-        description = "Enable experimental support to invoke IR Inliner before Klib serialization."
-    )
-    var irInlinerBeforeKlibSerialization = false
-        set(value) {
-            checkFrozen()
-            field = value
-        }
-
     @Argument(
         value = "-Xsuppress-warning",
         valueDescription = "<WARNING_NAME>",
@@ -924,10 +914,6 @@ The corresponding calls' declarations may not be marked with @BuilderInference."
                 put(LanguageFeature.WhenGuards, LanguageFeature.State.ENABLED)
             }
 
-            if (irInlinerBeforeKlibSerialization) {
-                put(LanguageFeature.IrInlinerBeforeKlibSerialization, LanguageFeature.State.ENABLED)
-            }
-
             if (multiDollarInterpolation) {
                 put(LanguageFeature.MultiDollarInterpolation, LanguageFeature.State.ENABLED)
             }

diff --git a/...-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonKlibBasedCompilerArguments.kt b/...-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonKlibBasedCompilerArguments.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.cli.common.arguments
 
 import org.jetbrains.kotlin.config.DuplicatedUniqueNameStrategy
+import org.jetbrains.kotlin.config.LanguageFeature
 
 abstract class CommonKlibBasedCompilerArguments : CommonCompilerArguments() {
     companion object {
@@ -77,4 +78,21 @@ abstract class CommonKlibBasedCompilerArguments : CommonCompilerArguments() {
             checkFrozen()
             field = if (value.isNullOrEmpty()) null else value
         }
+
+    @Argument(
+        value = "-Xklib-ir-inliner",
+        description = "Enable experimental support to invoke IR Inliner before Klib serialization."
+    )
+    var irInlinerBeforeKlibSerialization = false
+        set(value) {
+            checkFrozen()
+            field = value
+        }
+
+    override fun configureExtraLanguageFeatures(map: HashMap<LanguageFeature, LanguageFeature.State>) {
+        super.configureExtraLanguageFeatures(map)
+        if (irInlinerBeforeKlibSerialization) {
+            map[LanguageFeature.IrInlinerBeforeKlibSerialization] = LanguageFeature.State.ENABLED
+        }
+    }
 }
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
@@ -191,7 +191,6 @@ where advanced options include:
   -Xinference-compatibility  Enable compatibility changes for the generic type inference algorithm.
   -Xinline-classes           Enable experimental inline classes.
   -Xintellij-plugin-root=<path> Path to 'kotlin-compiler.jar' or the directory where the IntelliJ IDEA configuration files can be found.
-  -Xklib-ir-inliner          Enable experimental support to invoke IR Inliner before Klib serialization.
   -Xlegacy-smart-cast-after-try Allow 'var' smart casts even in the presence of assignments in 'try' blocks.
   -Xlist-phases              List backend phases.
   -Xmetadata-klib            Produce a klib that only contains the metadata of declarations.