From c2e67619ba5825e40ad5949f00ed052e0ca41cab Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 24 Oct 2023 12:20:18 +0200 Subject: [PATCH] CLI: remove obsolete -Xdisable-ultra-light-classes --- .../arguments/CommonCompilerArgumentsCopyGenerated.kt | 1 - .../cli/common/arguments/CommonCompilerArguments.kt | 10 ---------- .../cli/common/arguments/K2JVMCompilerArguments.kt | 1 - .../org/jetbrains/kotlin/config/JvmAnalysisFlags.kt | 3 --- compiler/testData/cli/js/jsExtraHelp.out | 1 - compiler/testData/cli/jvm/extraHelp.out | 1 - .../test/CompilerArgumentsContentProspectorTest.kt | 1 - 7 files changed, 18 deletions(-) diff --git a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt index 772cd1eef98..21bccdb3e40 100644 --- a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt +++ b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArgumentsCopyGenerated.kt @@ -22,7 +22,6 @@ fun copyCommonCompilerArguments(from: CommonCompilerArguments, to: CommonCompile to.contextReceivers = from.contextReceivers to.disableDefaultScriptingPlugin = from.disableDefaultScriptingPlugin to.disablePhases = from.disablePhases?.copyOf() - to.disableUltraLightClasses = from.disableUltraLightClasses to.dontWarnOnErrorSuppression = from.dontWarnOnErrorSuppression to.dumpDirectory = from.dumpDirectory to.dumpOnlyFqName = from.dumpOnlyFqName 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 e0be0b737ac..50ec4872192 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 @@ -542,16 +542,6 @@ They should be a subset of sources passed as free arguments.""" field = value } - @Argument( - value = "-Xdisable-ultra-light-classes", - description = "Don't use ultra-light classes." - ) - var disableUltraLightClasses = false - set(value) { - checkFrozen() - field = value - } - @Argument( value = "-Xuse-mixed-named-arguments", description = "Allow mixing named and unnamed arguments when the arguments appear in their default order." diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index e48186be0b3..3d6ab5500d2 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -857,7 +857,6 @@ This option is deprecated and will be deleted in future versions.""" result[JvmAnalysisFlags.suppressMissingBuiltinsError] = suppressMissingBuiltinsError result[JvmAnalysisFlags.enableJvmPreview] = enableJvmPreview result[AnalysisFlags.allowUnstableDependencies] = allowUnstableDependencies - result[JvmAnalysisFlags.disableUltraLightClasses] = disableUltraLightClasses result[JvmAnalysisFlags.useIR] = !useOldBackend return result } diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt index 44241485914..a2afbf6d134 100644 --- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt +++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt @@ -27,9 +27,6 @@ object JvmAnalysisFlags { @JvmStatic val suppressMissingBuiltinsError by AnalysisFlag.Delegates.Boolean - @JvmStatic - val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean - @JvmStatic val enableJvmPreview by AnalysisFlag.Delegates.Boolean diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index b32cc7f49bd..a433b8bbe83 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -78,7 +78,6 @@ where advanced options include: -Xdisable-default-scripting-plugin Don't enable the scripting plugin by default. -Xdisable-phases Disable backend phases. - -Xdisable-ultra-light-classes Don't use ultra-light classes. -Xdont-warn-on-error-suppression Don't report warnings when errors are suppressed. This only affects K2. -Xdump-directory Dump the backend state into this directory. diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index f4a928ddf0c..295cf07f9d1 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -165,7 +165,6 @@ where advanced options include: -Xdisable-default-scripting-plugin Don't enable the scripting plugin by default. -Xdisable-phases Disable backend phases. - -Xdisable-ultra-light-classes Don't use ultra-light classes. -Xdont-warn-on-error-suppression Don't report warnings when errors are suppressed. This only affects K2. -Xdump-directory Dump the backend state into this directory. diff --git a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt index ab13d89a67e..d723d366f47 100644 --- a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt +++ b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt @@ -99,7 +99,6 @@ class CompilerArgumentsContentProspectorTest { CommonCompilerArguments::checkStickyPhaseConditions, CommonCompilerArguments::useK2, CommonCompilerArguments::useFirExtendedCheckers, - CommonCompilerArguments::disableUltraLightClasses, CommonCompilerArguments::useMixedNamedArguments, CommonCompilerArguments::metadataKlib, CommonCompilerArguments::extendedCompilerChecks,