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

K2: do not run compilation if Java module graph setup failed

Browse Source 
#KT-61156 Fixed
This commit is contained in:
Alexander Udalov
2023-08-11 01:20:32 +02:00
committed by Space Team
parent 4e706ba93e
commit bddc18e463
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+1
View File
@@ -145,6 +145,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
if (configuration.getBoolean(CommonConfigurationKeys.USE_FIR) && configuration.getBoolean(CommonConfigurationKeys.USE_LIGHT_TREE)) { if (configuration.getBoolean(CommonConfigurationKeys.USE_FIR) && configuration.getBoolean(CommonConfigurationKeys.USE_LIGHT_TREE)) {
val projectEnvironment = val projectEnvironment =
createProjectEnvironment(configuration, rootDisposable, EnvironmentConfigFiles.JVM_CONFIG_FILES, messageCollector) createProjectEnvironment(configuration, rootDisposable, EnvironmentConfigFiles.JVM_CONFIG_FILES, messageCollector)
if (messageCollector.hasErrors()) return COMPILATION_ERROR
compileModulesUsingFrontendIrAndLightTree( compileModulesUsingFrontendIrAndLightTree(
projectEnvironment, configuration, messageCollector, buildFile, chunk, targetDescription projectEnvironment, configuration, messageCollector, buildFile, chunk, targetDescription
compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt
+1 -2
View File
@@ -165,8 +165,7 @@ abstract class AbstractJavaModulesIntegrationTest(
module("moduleB", listOf(module("moduleA")), addModules = emptyList()) 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() {
fun testReleaseFlagWrongValue() = muteForK2 {
module("module5", additionalKotlinArguments = listOf("-Xjdk-release=5"), checkKotlinOutput = { output -> module("module5", additionalKotlinArguments = listOf("-Xjdk-release=5"), checkKotlinOutput = { output ->
assertTrue(output, "error: unknown JDK release version: 5" in output) assertTrue(output, "error: unknown JDK release version: 5" in output)
assertTrue(output, "error: unknown JVM target version: 5" in output) assertTrue(output, "error: unknown JVM target version: 5" in output)