Get the header compile flag to work on konanc as well

Author: maxmg-jake

compiler/arguments/src/org/jetbrains/kotlin/arguments/description/CommonCompilerArguments.kt

@@ -67,13 +67,6 @@ val actualCommonCompilerArguments by compilerArgumentsLevel(CompilerArgumentsLev
                 """.trimIndent().asReleaseDependent()
         valueType = BooleanType.defaultFalse
 
-        additionalMetadata(
-            GradleOption(
-                value = DefaultValue.BOOLEAN_FALSE_DEFAULT,
-                gradleInputType = GradleInputTypes.INPUT
-            )
-        )
-
         lifecycle(
             introducedVersion = KotlinReleaseVersion.v2_2_0,
             stabilizedVersion = KotlinReleaseVersion.v2_2_0,

compiler/build-tools/kotlin-build-tools-impl/gen/org/jetbrains/kotlin/buildtools/internal/arguments/CommonCompilerArgumentsImpl.kt

@@ -355,6 +355,8 @@ internal open class CommonCompilerArgumentsImpl : CommonToolArgumentsImpl(),
 
     public val KOTLIN_HOME: CommonCompilerArgument<String?> = CommonCompilerArgument("KOTLIN_HOME")
 
+    public val HEADER: CommonCompilerArgument<Boolean> = CommonCompilerArgument("HEADER")
+
     public val PROGRESSIVE: CommonCompilerArgument<Boolean> = CommonCompilerArgument("PROGRESSIVE")
 
     public val OPT_IN: CommonCompilerArgument<Array<String>?> = CommonCompilerArgument("OPT_IN")

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

@@ -16,6 +16,19 @@ import org.jetbrains.kotlin.config.zipFileSystemAccessor
 import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor
 import org.jetbrains.kotlin.konan.file.ZipFileSystemCacheableAccessor
 import org.jetbrains.kotlin.konan.file.ZipFileSystemInPlaceAccessor
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.DuplicatedUniqueNameStrategy
+import org.jetbrains.kotlin.config.KlibAbiCompatibilityLevel
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.customKlibAbiVersion
+import org.jetbrains.kotlin.config.duplicatedUniqueNameStrategy
+import org.jetbrains.kotlin.config.headerCompilation
+import org.jetbrains.kotlin.config.klibAbiCompatibilityLevel
+import org.jetbrains.kotlin.config.klibNormalizeAbsolutePath
+import org.jetbrains.kotlin.config.klibRelativePathBases
+import org.jetbrains.kotlin.config.messageCollector
+import org.jetbrains.kotlin.config.produceKlibSignaturesClashChecks
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 import java.util.EnumMap
 import kotlin.collections.plus
@@ -76,6 +89,9 @@ fun CompilerConfiguration.copyCommonKlibArgumentsFrom(source: CompilerConfigurat
     klibAbiCompatibilityLevel = source.klibAbiCompatibilityLevel
 
     zipFileSystemAccessor = source.zipFileSystemAccessor
+
+    // Header compilation mode needs to be propagated to KLIB compilation.
+    headerCompilation = source.headerCompilation
 }
 
 private fun parseCustomKotlinAbiVersion(customKlibAbiVersion: String?, collector: MessageCollector): KotlinAbiVersion? {

compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt

@@ -2002,8 +2002,7 @@ class LightTreeRawFirDeclarationBuilder(
             }
 
             if (headerCompilationMode) {
-                val functionVisibility = calculatedModifiers.getVisibility()
-                if (functionVisibility == Visibilities.Private || functionVisibility == Visibilities.Protected) {
+                if (calculatedModifiers.getVisibility() == Visibilities.Private) {
                     return null
                 }
             }

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirFrontend.kt

@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.headerCompilation
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.fir.*
@@ -123,7 +124,7 @@ internal fun PhaseContext.firFrontendWithLightTree(input: KotlinCoreEnvironment)
             isCommonSource = { groupedSources.isCommonSourceForLt(it) },
             fileBelongsToModule = { file, it -> groupedSources.fileBelongsToModuleForLt(file, it) },
             buildResolveAndCheckFir = { session, files, diagnosticsReporter ->
-                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, null)
+                buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, null, configuration.headerCompilation)
             },
     )
 }