Renamed -Xklib-mpp to -Xexpect-actual-linker to reduce user confusion

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

@@ -321,10 +321,10 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
     var useMixedNamedArguments: Boolean by FreezableVar(false)
 
     @Argument(
-        value = "-Xklib-mpp",
-        description = "Enable experimental support for multi-platform klib libraries"
+        value = "-Xexpect-actual-linker",
+        description = "Enable experimental expect/actual linker"
     )
-    var klibBasedMpp: Boolean by FreezableVar(false)
+    var expectActualLinker: Boolean by FreezableVar(false)
 
     @Argument(value = "-Xdisable-default-scripting-plugin", description = "Do not enable scripting plugin by default")
     var disableDefaultScriptingPlugin: Boolean by FreezableVar(false)
@@ -347,7 +347,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
                 collector.report(CompilerMessageSeverity.WARNING, "'-Xexperimental' is deprecated and will be removed in a future release")
             }
             put(AnalysisFlags.useExperimental, useExperimental?.toList().orEmpty() + optIn?.toList().orEmpty())
-            put(AnalysisFlags.klibBasedMpp, klibBasedMpp)
+            put(AnalysisFlags.expectActualLinker, expectActualLinker)
             put(AnalysisFlags.explicitApiVersion, apiVersion != null)
             put(AnalysisFlags.allowResultReturnType, allowResultReturnType)
             ExplicitApiMode.fromString(explicitApi)?.also { put(AnalysisFlags.explicitApiMode, it) } ?: collector.report(

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

@@ -23,7 +23,7 @@ fun <A : CommonCompilerArguments> CompilerConfiguration.setupCommonArguments(
 ) {
     put(CommonConfigurationKeys.DISABLE_INLINE, arguments.noInline)
     put(CommonConfigurationKeys.USE_FIR, arguments.useFir)
-    put(CommonConfigurationKeys.KLIB_MPP, arguments.klibBasedMpp)
+    put(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER, arguments.expectActualLinker)
     putIfNotNull(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, arguments.intellijPluginRoot)
     put(CommonConfigurationKeys.REPORT_OUTPUT_FILES, arguments.reportOutputFiles)
 
@@ -118,4 +118,4 @@ private fun <A : CommonToolArguments> MessageCollector.reportUnsafeInternalArgum
                     "compiler or generated code. Use it at your own risk!\n"
         )
     }
-}
+}

compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt

@@ -106,7 +106,7 @@ class K2MetadataCompiler : CLICompiler<K2MetadataCompilerArguments>() {
         try {
             val metadataVersion =
                 configuration.get(CommonConfigurationKeys.METADATA_VERSION) as? BuiltInsBinaryVersion ?: BuiltInsBinaryVersion.INSTANCE
-            if (arguments.klibBasedMpp) {
+            if (arguments.expectActualLinker) {
                 K2MetadataKlibSerializer(metadataVersion).serialize(environment)
             } else {
                 MetadataSerializer(metadataVersion, true).serialize(environment)