From ab892037df0e89536fc14de29506a49cc434c155 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Thu, 6 Apr 2023 19:45:07 +0300 Subject: [PATCH] [K/N] Propagate IrMessageLogger to subcompilations Otherwise, some warnings/errors (like from IrLinker) might be lost --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index a03cb491f77..bcb3365ba0a 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.ir.linkage.partial.partialLinkageConfig import org.jetbrains.kotlin.ir.linkage.partial.setupPartialLinkageConfig +import org.jetbrains.kotlin.ir.util.IrMessageLogger import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion import org.jetbrains.kotlin.psi.KtFile @@ -124,6 +125,7 @@ class K2Native : CLICompiler() { val spawnedConfiguration = CompilerConfiguration() spawnedConfiguration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)) + spawnedConfiguration.put(IrMessageLogger.IR_MESSAGE_LOGGER, configuration.getNotNull(IrMessageLogger.IR_MESSAGE_LOGGER)) spawnedConfiguration.setupCommonArguments(spawnedArguments, this::createMetadataVersion) spawnedConfiguration.setupFromArguments(spawnedArguments) spawnedConfiguration.setupPartialLinkageConfig(configuration.partialLinkageConfig)