Skip to content

Commit 3618bb4

Browse files
committed
Get the header compile flag to work on konanc as well
1 parent 41b9911 commit 3618bb4

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ internal open class CommonCompilerArgumentsImpl : CommonToolArgumentsImpl(),
351351

352352
public val KOTLIN_HOME: CommonCompilerArgument<String?> = CommonCompilerArgument("KOTLIN_HOME")
353353

354+
public val HEADER: CommonCompilerArgument<Boolean> = CommonCompilerArgument("HEADER")
355+
354356
public val PROGRESSIVE: CommonCompilerArgument<Boolean> = CommonCompilerArgument("PROGRESSIVE")
355357

356358
public val OPT_IN: CommonCompilerArgument<Array<String>?> = CommonCompilerArgument("OPT_IN")

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.config.LanguageFeature
1616
import org.jetbrains.kotlin.config.LanguageVersion
1717
import org.jetbrains.kotlin.config.customKlibAbiVersion
1818
import org.jetbrains.kotlin.config.duplicatedUniqueNameStrategy
19+
import org.jetbrains.kotlin.config.headerCompilation
1920
import org.jetbrains.kotlin.config.klibAbiCompatibilityLevel
2021
import org.jetbrains.kotlin.config.klibNormalizeAbsolutePath
2122
import org.jetbrains.kotlin.config.klibRelativePathBases
@@ -76,6 +77,9 @@ fun CompilerConfiguration.copyCommonKlibArgumentsFrom(source: CompilerConfigurat
7677

7778
// ABI compatibility level (the one that actually affects the KLIB serialization).
7879
klibAbiCompatibilityLevel = source.klibAbiCompatibilityLevel
80+
81+
// Header compilation mode needs to be propagated to KLIB compilation.
82+
headerCompilation = source.headerCompilation
7983
}
8084

8185
private fun parseCustomKotlinAbiVersion(customKlibAbiVersion: String?, collector: MessageCollector): KotlinAbiVersion? {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,8 +2002,7 @@ class LightTreeRawFirDeclarationBuilder(
20022002
}
20032003

20042004
if (headerCompilationMode) {
2005-
val functionVisibility = calculatedModifiers.getVisibility()
2006-
if (functionVisibility == Visibilities.Private || functionVisibility == Visibilities.Protected) {
2005+
if (calculatedModifiers.getVisibility() == Visibilities.Private) {
20072006
return null
20082007
}
20092008
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
88
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
99
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
1010
import org.jetbrains.kotlin.config.CommonConfigurationKeys
11+
import org.jetbrains.kotlin.config.headerCompilation
1112
import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
1213
import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
1314
import org.jetbrains.kotlin.fir.*
@@ -123,7 +124,7 @@ internal fun PhaseContext.firFrontendWithLightTree(input: KotlinCoreEnvironment)
123124
isCommonSource = { groupedSources.isCommonSourceForLt(it) },
124125
fileBelongsToModule = { file, it -> groupedSources.fileBelongsToModuleForLt(file, it) },
125126
buildResolveAndCheckFir = { session, files, diagnosticsReporter ->
126-
buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, null)
127+
buildResolveAndCheckFirViaLightTree(session, files, diagnosticsReporter, null, configuration.headerCompilation)
127128
},
128129
)
129130
}

0 commit comments

Comments
 (0)