diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt index 33791b24287..8810ad00e92 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt @@ -239,16 +239,16 @@ abstract class CommonCompilerArguments : CommonToolArguments() { var profilePhases: Boolean by FreezableVar(false) @Argument( - value = "-Xcheck-conditions", + value = "-Xcheck-phase-conditions", description = "Check pre- and postconditions on phases" ) var checkPhaseConditions: Boolean by FreezableVar(false) @Argument( - value = "-Xcheck-sticky-conditions", + value = "-Xcheck-sticky-phase-conditions", description = "Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions" ) - var checkStickyConditions: Boolean by FreezableVar(false) + var checkStickyPhaseConditions: Boolean by FreezableVar(false) open fun configureAnalysisFlags(collector: MessageCollector): MutableMap, Any> { return HashMap, Any>().apply { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt index a793750bed4..8b63db07a10 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt @@ -53,8 +53,8 @@ fun CompilerConfiguration.setupCommonArguments( } put(CommonConfigurationKeys.PROFILE_PHASES, arguments.profilePhases) - put(CommonConfigurationKeys.CHECK_PHASE_CONDITIONS, arguments.checkPhaseConditions or arguments.checkStickyConditions) - put(CommonConfigurationKeys.CHECK_STICKY_CONDITIONS, arguments.checkStickyConditions) + put(CommonConfigurationKeys.CHECK_PHASE_CONDITIONS, arguments.checkPhaseConditions or arguments.checkStickyPhaseConditions) + put(CommonConfigurationKeys.CHECK_STICKY_CONDITIONS, arguments.checkStickyPhaseConditions) } fun CompilerConfiguration.setupLanguageVersionSettings(arguments: A) { diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index 4cd4974548f..0f86c1e3290 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -5,6 +5,9 @@ where advanced options include: -Xtyped-arrays Translate primitive arrays to JS typed arrays -Xallow-kotlin-package Allow compiling code in package 'kotlin' and allow not requiring kotlin.stdlib in module-info -Xallow-result-return-type Allow compiling code when `kotlin.Result` is used as a return type + -Xcheck-phase-conditions Check pre- and postconditions on phases + -Xcheck-sticky-phase-conditions + Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions -Xcommon-sources= Sources of the common module that need to be compiled together with this module in the multi-platform mode. Should be a subset of sources passed as free arguments -Xcoroutines={enable|warn|error} diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 135b433aead..f3d850770c0 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -69,6 +69,9 @@ where advanced options include: -Xuse-type-table Use type table in metadata serialization -Xallow-kotlin-package Allow compiling code in package 'kotlin' and allow not requiring kotlin.stdlib in module-info -Xallow-result-return-type Allow compiling code when `kotlin.Result` is used as a return type + -Xcheck-phase-conditions Check pre- and postconditions on phases + -Xcheck-sticky-phase-conditions + Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions -Xcommon-sources= Sources of the common module that need to be compiled together with this module in the multi-platform mode. Should be a subset of sources passed as free arguments -Xcoroutines={enable|warn|error}