azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[KLIB] Use -Xmetadata-klib to produce metadata KLIBs

Browse Source 
With this change a new `-Xmetadata-klib` CLI flag becomes the
preferable way to instruct K2MetadataCompiler to produce metadata
KLIBs. The old `-Xexpect-actual-linker` flag still works for
K2MetadataCompiler, but that would last just for a short transition
period until the necessary changes are made in the Gradle plugin.

The K2NativeCompiler does not work anymore with `-Xexpect-actual-linker`
and respects only the `-Xmetadata-klib` flag. This is not an
issue since the Gradle plugin anyway supplies both flags for Native
metadata compilations.

^KT-61136
This commit is contained in:
Dmitriy Dolovov
2023-09-15 19:29:44 +02:00
committed by Space Team
parent 848c88b1a5
commit 38a67f3d30
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt
+4 -2
View File
@@ -101,7 +101,8 @@ class K2MetadataCompiler : CLICompiler<K2MetadataCompilerArguments>() {
val environment =
KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.METADATA_CONFIG_FILES)
val mode = if(arguments.expectActualLinker) "KLib" else "metadata"
// TODO (KT-61136): drop `expectActualLinker` later, after the appropriate changes in the Gradle plugin
val mode = if (arguments.expectActualLinker || arguments.metadataKlib) "KLib" else "metadata"
val sourceFiles = environment.getSourceFiles()
performanceManager.notifyCompilerInitialized(sourceFiles.size, environment.countLinesOfCode(sourceFiles), "$mode mode for $moduleName module")
@@ -120,7 +121,8 @@ class K2MetadataCompiler : CLICompiler<K2MetadataCompilerArguments>() {
val useFir = configuration.getBoolean(CommonConfigurationKeys.USE_FIR)
val metadataSerializer = when {
useFir -> FirMetadataSerializer(configuration, environment)
arguments.expectActualLinker -> K2MetadataKlibSerializer(configuration, environment)
// TODO (KT-61136): drop `expectActualLinker` later, after the appropriate changes in the Gradle plugin
arguments.expectActualLinker || arguments.metadataKlib -> K2MetadataKlibSerializer(configuration, environment)
else -> MetadataSerializer(configuration, environment, dependOnOldBuiltIns = true)
}
metadataSerializer.analyzeAndSerialize()