Remove obsolete compiler flag -Xuse-ir

This commit is contained in:
Alexander Udalov
2023-05-19 17:06:34 +02:00
committed by Space Team
parent 2951e0b955
commit 60016d3e5b
18 changed files with 3 additions and 77 deletions
@@ -77,7 +77,6 @@ fun copyK2JVMCompilerArguments(from: K2JVMCompilerArguments, to: K2JVMCompilerAr
to.suppressMissingBuiltinsError = from.suppressMissingBuiltinsError
to.typeEnhancementImprovementsInStrictMode = from.typeEnhancementImprovementsInStrictMode
to.useFastJarFileSystem = from.useFastJarFileSystem
to.useIR = from.useIR
to.useJavac = from.useJavac
to.useOldBackend = from.useOldBackend
to.useOldClassFilesReading = from.useOldClassFilesReading
@@ -145,16 +145,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
// Advanced options
@Argument(
value = "-Xuse-ir",
description = "Use the IR backend. This option has no effect unless the language version less than 1.5 is used"
)
var useIR = false
set(value) {
checkFrozen()
field = value
}
@Argument(value = "-Xuse-old-backend", description = "Use the old JVM backend")
var useOldBackend = false
set(value) {
@@ -246,14 +246,8 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
put(JVMConfigurationKeys.PARAMETERS_METADATA, arguments.javaParameters)
// TODO: ignore previous configuration value when we do not need old backend in scripting by default
val useOldBackend = arguments.useOldBackend || (!arguments.useIR && get(JVMConfigurationKeys.IR) == false)
val useIR = arguments.useK2 || languageVersionSettings.languageVersion.usesK2 ||
if (languageVersionSettings.supportsFeature(LanguageFeature.JvmIrEnabledByDefault)) {
!useOldBackend
} else {
arguments.useIR && !useOldBackend
}
val useOldBackend = arguments.useOldBackend
val useIR = arguments.useK2 || languageVersionSettings.languageVersion.usesK2 || !useOldBackend
messageCollector.report(LOGGING, "Using ${if (useIR) "JVM IR" else "old JVM"} backend")