From bddc18e463c31f0e7d22e7af78490640f65a140c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 11 Aug 2023 01:20:32 +0200 Subject: [PATCH] K2: do not run compilation if Java module graph setup failed #KT-61156 Fixed --- compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 1 + .../kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 89bd3510ccf..fc659ef0a9a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -145,6 +145,7 @@ class K2JVMCompiler : CLICompiler() { if (configuration.getBoolean(CommonConfigurationKeys.USE_FIR) && configuration.getBoolean(CommonConfigurationKeys.USE_LIGHT_TREE)) { val projectEnvironment = createProjectEnvironment(configuration, rootDisposable, EnvironmentConfigFiles.JVM_CONFIG_FILES, messageCollector) + if (messageCollector.hasErrors()) return COMPILATION_ERROR compileModulesUsingFrontendIrAndLightTree( projectEnvironment, configuration, messageCollector, buildFile, chunk, targetDescription diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt index abd9224192d..7d1679b2311 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt @@ -165,8 +165,7 @@ abstract class AbstractJavaModulesIntegrationTest( module("moduleB", listOf(module("moduleA")), addModules = emptyList()) } - // TODO (KT-61156): do not try to run compilation if there were errors during calculation of Java module graph. - fun testReleaseFlagWrongValue() = muteForK2 { + fun testReleaseFlagWrongValue() { module("module5", additionalKotlinArguments = listOf("-Xjdk-release=5"), checkKotlinOutput = { output -> assertTrue(output, "error: unknown JDK release version: 5" in output) assertTrue(output, "error: unknown JVM target version: 5" in output)