JVM: remove -Xuse-old-backend

#KT-71197
JetBrains · Feb 12, 2025 · 8d62066 · 8d62066
1 parent cac08d3
commit 8d62066
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 102 deletions.
diff --git a/...mmon/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt b/...mmon/gen/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArgumentsCopyGenerated.kt
@@ -79,7 +79,6 @@ fun copyK2JVMCompilerArguments(from: K2JVMCompilerArguments, to: K2JVMCompilerAr
     to.useInlineScopesNumbers = from.useInlineScopesNumbers
     to.useJavac = from.useJavac
     to.useK2Kapt = from.useK2Kapt
-    to.useOldBackend = from.useOldBackend
     to.useOldClassFilesReading = from.useOldClassFilesReading
     to.useOldInlineClassesManglingScheme = from.useOldInlineClassesManglingScheme
     to.useTypeTable = from.useTypeTable

diff --git a/...r/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/...r/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -1096,9 +1096,6 @@ default: 'first-only-warn' in language version 2.2+, 'first-only' in version 2.1
         }
     }
 
-    protected open fun defaultLanguageVersion(collector: MessageCollector): LanguageVersion =
-        LanguageVersion.LATEST_STABLE
-
     protected open fun checkPlatformSpecificSettings(languageVersionSettings: LanguageVersionSettings, collector: MessageCollector) {
     }
 
@@ -1136,7 +1133,7 @@ default: 'first-only-warn' in language version 2.2+, 'first-only' in version 2.1
         }
 
         // If only "-api-version" is specified, language version is assumed to be the latest stable
-        return parseVersion(collector, languageVersion, "language") ?: defaultLanguageVersion(collector)
+        return parseVersion(collector, languageVersion, "language") ?: LanguageVersion.LATEST_STABLE
     }
 
     private fun parseVersion(collector: MessageCollector, value: String?, versionOf: String): LanguageVersion? =

diff --git a/...er/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/...er/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -165,13 +165,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
 
     // Advanced options
 
-    @Argument(value = "-Xuse-old-backend", description = "Use the old JVM backend.")
-    var useOldBackend = false
-        set(value) {
-            checkFrozen()
-            field = value
-        }
-
     @Argument(
         value = "-Xallow-unstable-dependencies",
         description = "Do not report errors on classes in dependencies that were compiled by an unstable version of the Kotlin compiler."
@@ -854,7 +847,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.useIR] = !useOldBackend
         result[JvmAnalysisFlags.outputBuiltinsMetadata] = outputBuiltinsMetadata
         if (expectBuiltinsAsPartOfStdlib && !stdlibCompilation) {
             collector.report(
@@ -909,26 +901,7 @@ This option is deprecated and will be deleted in future versions."""
         return result
     }
 
-    override fun defaultLanguageVersion(collector: MessageCollector): LanguageVersion =
-        if (useOldBackend) {
-            if (!suppressVersionWarnings) {
-                collector.report(
-                    CompilerMessageSeverity.STRONG_WARNING,
-                    "Language version is automatically inferred to ${LanguageVersion.KOTLIN_1_5.versionString} when using " +
-                            "the old JVM backend. Consider specifying -language-version explicitly, or remove -Xuse-old-backend"
-                )
-            }
-            LanguageVersion.KOTLIN_1_5
-        } else super.defaultLanguageVersion(collector)
-
     override fun checkPlatformSpecificSettings(languageVersionSettings: LanguageVersionSettings, collector: MessageCollector) {
-        if (useOldBackend && languageVersionSettings.languageVersion >= LanguageVersion.KOTLIN_1_6) {
-            collector.report(
-                CompilerMessageSeverity.ERROR,
-                "Old JVM backend does not support language version 1.6 or above. " +
-                        "Please use language version 1.5 or below, or remove -Xuse-old-backend"
-            )
-        }
         if (oldInnerClassesLogic) {
             collector.report(
                 CompilerMessageSeverity.WARNING,

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -121,10 +121,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
                 )
             projectEnvironment.registerExtensionsFromPlugins(configuration)
 
-            if (arguments.useOldBackend) {
-                messageCollector.report(WARNING, "-Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend")
-            }
-
             if (arguments.script || arguments.expression != null) {
                 val scriptingEvaluator = ScriptEvaluationExtension.getInstances(projectEnvironment.project).find { it.isAccepted(arguments) }
                 if (scriptingEvaluator == null) {
@@ -142,12 +138,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             }
         }
 
-        if (arguments.useOldBackend) {
-            val severity = if (isUseOldBackendAllowed()) WARNING else ERROR
-            messageCollector.report(severity, "-Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend")
-            if (severity == ERROR) return COMPILATION_ERROR
-        }
-
         messageCollector.report(LOGGING, "Configuring the compilation environment")
         try {
             val buildFile = arguments.buildFile?.let { File(it) }
@@ -285,9 +275,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
     override fun createPerformanceManager(arguments: K2JVMCompilerArguments, services: Services): PerformanceManager {
         return createCustomPerformanceManagerOrNull(arguments, services) ?: defaultPerformanceManager
     }
-
-    private fun isUseOldBackendAllowed(): Boolean =
-        K2JVMCompiler::class.java.classLoader.getResource("META-INF/unsafe-allow-use-old-backend") != null
 }
 
 fun CompilerConfiguration.configureModuleChunk(

diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
@@ -30,9 +30,6 @@ object JvmAnalysisFlags {
     @JvmStatic
     val enableJvmPreview by AnalysisFlag.Delegates.Boolean
 
-    @JvmStatic
-    val useIR by AnalysisFlag.Delegates.Boolean
-
     @JvmStatic
     val outputBuiltinsMetadata by AnalysisFlag.Delegates.Boolean
 

diff --git a/...ontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuspendInFunInterfaceChecker.kt b/...ontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuspendInFunInterfaceChecker.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.resolve.jvm.checkers
 
-import org.jetbrains.kotlin.config.JvmAnalysisFlags
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -29,12 +28,10 @@ class SuspendInFunInterfaceChecker : DeclarationChecker {
         val abstractMember = getSingleAbstractMethodOrNull(descriptor) ?: return
         if (!abstractMember.isSuspend) return
 
-        if (context.languageVersionSettings.supportsFeature(LanguageFeature.SuspendFunctionsInFunInterfaces) &&
-            context.languageVersionSettings.getFlag(JvmAnalysisFlags.useIR)
-        ) return
+        if (context.languageVersionSettings.supportsFeature(LanguageFeature.SuspendFunctionsInFunInterfaces)) return
 
         val ktFunction = abstractMember.source.getPsi() as? KtNamedFunction
         val reportOn = ktFunction?.modifierList?.getModifier(KtTokens.SUSPEND_KEYWORD) ?: funKeyword
         context.trace.report(Errors.FUN_INTERFACE_WITH_SUSPEND_FUNCTION.on(reportOn))
     }
-}
+}
diff --git a/...infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt b/...infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
@@ -115,7 +115,6 @@ class LanguageVersionSettingsBuilder {
             analysisFlag(JvmAnalysisFlags.sanitizeParentheses, trueOrNull(LanguageSettingsDirectives.SANITIZE_PARENTHESES in directives)),
             analysisFlag(JvmAnalysisFlags.enableJvmPreview, trueOrNull(LanguageSettingsDirectives.ENABLE_JVM_PREVIEW in directives)),
             analysisFlag(JvmAnalysisFlags.expectBuiltinsAsPartOfStdlib, trueOrNull(LanguageSettingsDirectives.EXPECT_BUILTINS_AS_PART_OF_STDLIB in directives)),
-            analysisFlag(JvmAnalysisFlags.useIR, targetBackend?.isIR != false),
 
             analysisFlag(AnalysisFlags.explicitApiVersion, trueOrNull(apiVersion != null)),
         )

diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
@@ -130,7 +130,6 @@ where advanced options include:
   -Xuse-inline-scopes-numbers Use inline scopes numbers for inline marker variables.
   -Xuse-javac                Use javac for Java source and class file analysis.
   -Xuse-k2-kapt              Enable the experimental support for K2 KAPT.
-  -Xuse-old-backend          Use the old JVM backend.
   -Xuse-old-class-files-reading Use the old implementation for reading class files. This may slow down the compilation and cause problems with Groovy interop.
                              This can be used in the event of problems with the new implementation.
   -Xuse-14-inline-classes-mangling-scheme

diff --git a/compiler/testData/cli/jvm/oldBackend.args b/compiler/testData/cli/jvm/oldBackend.args
diff --git a/compiler/testData/cli/jvm/oldBackend.out b/compiler/testData/cli/jvm/oldBackend.out
diff --git a/compiler/testData/cli/jvm/oldBackendWithScript.args b/compiler/testData/cli/jvm/oldBackendWithScript.args
diff --git a/compiler/testData/cli/jvm/oldBackendWithScript.out b/compiler/testData/cli/jvm/oldBackendWithScript.out
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
@@ -5,10 +5,8 @@
 
 package org.jetbrains.kotlin.codegen
 
-import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -103,26 +101,6 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
         return BytecodeListingTextCollectingVisitor.getText(classFileFactory, ListAnalysisFilter())
     }
 
-    override fun updateConfiguration(configuration: CompilerConfiguration) {
-        super.updateConfiguration(configuration)
-        configureIrAnalysisFlag(configuration)
-    }
-
-    // TODO: rewrite the test on the new infrastructure, so that this won't be needed.
-    private fun configureIrAnalysisFlag(configuration: CompilerConfiguration) {
-        val irFlag: Map<AnalysisFlag<*>, Boolean> = mapOf(JvmAnalysisFlags.useIR to backend.isIR)
-        val lvs = configuration.languageVersionSettings
-        if (lvs is CompilerTestLanguageVersionSettings) {
-            configuration.languageVersionSettings = LanguageVersionSettingsImpl(
-                lvs.languageVersion, lvs.apiVersion, lvs.analysisFlags + irFlag, lvs.extraLanguageFeatures,
-            )
-        } else {
-            configuration.languageVersionSettings = LanguageVersionSettingsImpl(
-                LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, irFlag,
-            )
-        }
-    }
-
     private class ListAnalysisFilter : BytecodeListingTextCollectingVisitor.Filter {
         @Suppress("UNCHECKED_CAST")
         override fun shouldWriteClass(node: ClassNode): Boolean {

diff --git a/compiler/tests-integration/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-integration/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java