[CLI] Move '-Xverify-ir-visibility-after-inlining' CLI argument

Move '-Xverify-ir-visibility-after-inlining' CLI argument
key from `CommonCompilerArguments` to `CommonKlibBasedCompilerArguments`
as it makes sense only for KLIBs (and the IR inliner at the first phase
of KLIB compilation).

^KT-67298

Author: ddolovov

compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt

@@ -86,7 +86,6 @@ fun copyCommonCompilerArguments(from: CommonCompilerArguments, to: CommonCompile
     to.verbosePhases = from.verbosePhases?.copyOf()
     to.verifyIr = from.verifyIr
     to.verifyIrVisibility = from.verifyIrVisibility
-    to.verifyIrVisibilityAfterInlining = from.verifyIrVisibilityAfterInlining
     to.whenGuards = from.whenGuards
 
     return to

compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonKlibBasedCompilerArgumentsCopyGenerated.kt

@@ -18,6 +18,7 @@ fun copyCommonKlibBasedCompilerArguments(from: CommonKlibBasedCompilerArguments,
     to.partialLinkageLogLevel = from.partialLinkageLogLevel
     to.partialLinkageMode = from.partialLinkageMode
     to.relativePathBases = from.relativePathBases?.copyOf()
+    to.verifyIrVisibilityAfterInlining = from.verifyIrVisibilityAfterInlining
 
     return to
 }

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

@@ -460,19 +460,6 @@ They should be a subset of sources passed as free arguments."""
             field = value
         }
 
-    @Argument(
-        value = "-Xverify-ir-visibility-after-inlining",
-        description = """Check for visibility violations in IR when validating it after the function inlining phase.
-Only has effect if '-Xverify-ir' is not 'none'.
-This flag is deprecated and will soon be removed in favor of '-Xverify-ir-visibility'.
-""",
-    )
-    var verifyIrVisibilityAfterInlining: Boolean = false
-        set(value) {
-            checkFrozen()
-            field = value
-        }
-
     @Argument(
         value = "-Xprofile-phases",
         description = "Profile backend phases."

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

@@ -5,8 +5,11 @@
 
 package org.jetbrains.kotlin.cli.common.arguments
 
+import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import org.jetbrains.kotlin.config.AnalysisFlag
 import org.jetbrains.kotlin.config.DuplicatedUniqueNameStrategy
 import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.config.LanguageVersion
 
 abstract class CommonKlibBasedCompilerArguments : CommonCompilerArguments() {
     companion object {
@@ -58,6 +61,19 @@ abstract class CommonKlibBasedCompilerArguments : CommonCompilerArguments() {
             field = if (value.isNullOrEmpty()) null else value
         }
 
+    @Argument(
+        value = "-Xverify-ir-visibility-after-inlining",
+        description = """Check for visibility violations in IR when validating it after the function inlining phase.
+Only has effect if '-Xverify-ir' is not 'none'.
+This flag is deprecated and will soon be removed in favor of '-Xverify-ir-visibility'.
+""",
+    )
+    var verifyIrVisibilityAfterInlining: Boolean = false
+        set(value) {
+            checkFrozen()
+            field = value
+        }
+
     @Argument(
         value = "-Xklib-no-double-inlining",
         description = "Turn off double-inlining mode."
@@ -89,6 +105,8 @@ abstract class CommonKlibBasedCompilerArguments : CommonCompilerArguments() {
             field = value
         }
 
+
+
     override fun configureExtraLanguageFeatures(map: HashMap<LanguageFeature, LanguageFeature.State>) {
         super.configureExtraLanguageFeatures(map)
         if (irInlinerBeforeKlibSerialization) {

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.kt

@@ -846,6 +846,8 @@ class K2JSCompiler : CLICompiler<K2JSCompilerArguments>() {
         arguments: K2JSCompilerArguments,
         services: Services,
     ) {
+        configuration.setupCommonKlibArguments(arguments)
+
         val messageCollector = configuration.getNotNull(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY)
 
         @Suppress("DEPRECATION")

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

@@ -55,16 +55,6 @@ fun CompilerConfiguration.setupCommonArguments(
         }
     }
 
-    if (arguments.verifyIrVisibilityAfterInlining) {
-        put(KlibConfigurationKeys.ENABLE_IR_VISIBILITY_CHECKS_AFTER_INLINING, true)
-        if (irVerificationMode == IrVerificationMode.NONE) {
-            messageCollector.report(
-                CompilerMessageSeverity.WARNING,
-                "'-Xverify-ir-visibility-after-inlining' has no effect unless '-Xverify-ir=warning' or '-Xverify-ir=error' is specified"
-            )
-        }
-    }
-
     val metadataVersionString = arguments.metadataVersion
     if (metadataVersionString != null) {
         val versionArray = BinaryVersion.parseVersionArray(metadataVersionString)

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.cli.common
+
+import org.jetbrains.kotlin.cli.common.arguments.CommonKlibBasedCompilerArguments
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.IrVerificationMode
+import org.jetbrains.kotlin.config.KlibConfigurationKeys
+
+fun CompilerConfiguration.setupCommonKlibArguments(
+    arguments: CommonKlibBasedCompilerArguments
+) {
+    val messageCollector = getNotNull(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY)
+
+    if (arguments.verifyIrVisibilityAfterInlining) {
+        put(KlibConfigurationKeys.ENABLE_IR_VISIBILITY_CHECKS_AFTER_INLINING, true)
+
+        val irVerificationMode = get(CommonConfigurationKeys.VERIFY_IR, IrVerificationMode.NONE)
+        if (irVerificationMode == IrVerificationMode.NONE) {
+            messageCollector.report(
+                CompilerMessageSeverity.WARNING,
+                "'-Xverify-ir-visibility-after-inlining' has no effect unless '-Xverify-ir=warning' or '-Xverify-ir=error' is specified"
+            )
+        }
+    }
+}

compiler/testData/cli/jvm/extraHelp.out

@@ -239,11 +239,6 @@ where advanced options include:
   -Xverify-ir={none|warning|error}
                              IR verification mode (no verification by default).
   -Xverify-ir-visibility     Check for visibility violations in IR when validating it before running any lowerings. Only has effect if '-Xverify-ir' is not 'none'.
-  -Xverify-ir-visibility-after-inlining
-                             Check for visibility violations in IR when validating it after the function inlining phase.
-                             Only has effect if '-Xverify-ir' is not 'none'.
-                             This flag is deprecated and will soon be removed in favor of '-Xverify-ir-visibility'.
-
   -Xwhen-guards              Enable experimental language support for when guards.
 
 Advanced options are non-standard and may be changed or removed without any notice.

native/cli-native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt

@@ -190,6 +190,7 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
             arguments: K2NativeCompilerArguments,
             services: Services
     ) {
+        configuration.setupCommonKlibArguments(arguments)
         configuration.setupFromArguments(arguments)
     }