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 0b70c01bce5..ffb388f0b5d 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 @@ -91,7 +91,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { ) var useIR: Boolean by FreezableVar(false) - @GradleOption(DefaultValues.BooleanFalseDefault::class) @Argument(value = "-Xuse-old-backend", description = "Use the old JVM backend") var useOldBackend: Boolean by FreezableVar(false) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 2db08cf0b49..764b687fdcc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -101,6 +101,10 @@ class K2JVMCompiler : CLICompiler() { ) 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) { @@ -118,6 +122,11 @@ class K2JVMCompiler : CLICompiler() { } } + if (arguments.useOldBackend) { + messageCollector.report(ERROR, "-Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend") + return COMPILATION_ERROR + } + messageCollector.report(LOGGING, "Configuring the compilation environment") try { val buildFile = arguments.buildFile?.let { File(it) } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt index 796c312332c..8c75c28225c 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt @@ -265,20 +265,6 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr arguments.useIR && !useOldBackend } - if (arguments.useOldBackend) { - messageCollector.report( - STRONG_WARNING, - "-Xuse-old-backend is deprecated and will be removed in a future release" - ) - if (arguments.useIR) { - messageCollector.report( - STRONG_WARNING, - "Both -Xuse-ir and -Xuse-old-backend are passed. This is an inconsistent configuration. " + - "The compiler will use the ${if (useIR) "JVM IR" else "old JVM"} backend" - ) - } - } - messageCollector.report(LOGGING, "Using ${if (useIR) "JVM IR" else "old JVM"} backend") put(JVMConfigurationKeys.IR, useIR) @@ -377,7 +363,6 @@ private fun parseBackendThreads(stringValue: String, messageCollector: MessageCo fun CompilerConfiguration.configureKlibPaths(arguments: K2JVMCompilerArguments) { val libraries = arguments.klibLibraries ?: return - assert(arguments.useIR && !arguments.useOldBackend) { "Klib libraries can only be used with IR backend" } put(JVMConfigurationKeys.KLIB_PATHS, libraries.split(File.pathSeparator.toRegex()).filterNot(String::isEmpty)) } diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt index dd29a517a3d..35f8dcd870c 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt @@ -6,15 +6,9 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.toBooleanLenient - - -private val USE_BE_IR = System.getProperty("fir.bench.fe1.useIR", "false").toBooleanLenient()!! class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() { override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) { - args.useIR = USE_BE_IR - args.useOldBackend = !USE_BE_IR args.useK2 = false args.jvmDefault = "compatibility" args.apiVersion = "1.4" @@ -34,4 +28,4 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() { runTestOnce(i) } } -} \ No newline at end of file +} diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args deleted file mode 100644 index 95a2e286aa9..00000000000 --- a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args +++ /dev/null @@ -1,5 +0,0 @@ -$TESTDATA_DIR$/simple.kt --d -$TEMP_DIR$ --Xabi-stability=unstable --Xuse-old-backend diff --git a/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.args b/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.args deleted file mode 100644 index 2af4fe0d60f..00000000000 --- a/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.args +++ /dev/null @@ -1,7 +0,0 @@ -$TESTDATA_DIR$/simple.kt --d -$TEMP_DIR$ --Xuse-ir --Xuse-old-backend --language-version -1.5 diff --git a/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.out b/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.out deleted file mode 100644 index 8e54cf0ad1c..00000000000 --- a/compiler/testData/cli/jvm/bothJvmIrAndOldBackend.out +++ /dev/null @@ -1,3 +0,0 @@ -warning: -Xuse-old-backend is deprecated and will be removed in a future release -warning: both -Xuse-ir and -Xuse-old-backend are passed. This is an inconsistent configuration. The compiler will use the old JVM backend -OK diff --git a/compiler/testData/cli/jvm/classAndTraitClash.args b/compiler/testData/cli/jvm/classAndTraitClash.args index 6ed43fe597e..725b9b150d7 100644 --- a/compiler/testData/cli/jvm/classAndTraitClash.args +++ b/compiler/testData/cli/jvm/classAndTraitClash.args @@ -1,6 +1,3 @@ $TESTDATA_DIR$/classAndTraitClash.kt -d $TEMP_DIR$ --Xuse-old-backend --language-version -1.5 diff --git a/compiler/testData/cli/jvm/classAndTraitClash.kt b/compiler/testData/cli/jvm/classAndTraitClash.kt index 4981c9ae42e..2b6b974ec69 100644 --- a/compiler/testData/cli/jvm/classAndTraitClash.kt +++ b/compiler/testData/cli/jvm/classAndTraitClash.kt @@ -1,9 +1,9 @@ package test -interface T1 { - +interface T1 { + fun f() {} } class `T1$DefaultImpls` { -} \ No newline at end of file +} diff --git a/compiler/testData/cli/jvm/classAndTraitClash.out b/compiler/testData/cli/jvm/classAndTraitClash.out index 6b3c2f4465f..a7d623d0de8 100644 --- a/compiler/testData/cli/jvm/classAndTraitClash.out +++ b/compiler/testData/cli/jvm/classAndTraitClash.out @@ -1,8 +1,7 @@ -warning: -Xuse-old-backend is deprecated and will be removed in a future release -compiler/testData/cli/jvm/classAndTraitClash.kt:3:1: error: duplicate JVM class name 'test/T1$DefaultImpls' generated from: `T1$DefaultImpls`, T1 -interface T1 { +compiler/testData/cli/jvm/classAndTraitClash.kt:3:1: error: duplicate JVM class name 'test/T1$DefaultImpls' generated from: `T1$DefaultImpls`, DefaultImpls +interface T1 { ^ -compiler/testData/cli/jvm/classAndTraitClash.kt:7:1: error: duplicate JVM class name 'test/T1$DefaultImpls' generated from: `T1$DefaultImpls`, T1 +compiler/testData/cli/jvm/classAndTraitClash.kt:7:1: error: duplicate JVM class name 'test/T1$DefaultImpls' generated from: `T1$DefaultImpls`, DefaultImpls class `T1$DefaultImpls` { ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/oldBackendLv16.args b/compiler/testData/cli/jvm/oldBackend.args similarity index 72% rename from compiler/testData/cli/jvm/oldBackendLv16.args rename to compiler/testData/cli/jvm/oldBackend.args index b04d96186ae..6dc0ab565e6 100644 --- a/compiler/testData/cli/jvm/oldBackendLv16.args +++ b/compiler/testData/cli/jvm/oldBackend.args @@ -2,5 +2,3 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -Xuse-old-backend --language-version -1.6 diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out b/compiler/testData/cli/jvm/oldBackend.out similarity index 55% rename from compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out rename to compiler/testData/cli/jvm/oldBackend.out index ce1c49c4e1c..553767d843e 100644 --- a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out +++ b/compiler/testData/cli/jvm/oldBackend.out @@ -1,4 +1,3 @@ warning: language version is automatically inferred to 1.5 when using the old JVM backend. Consider specifying -language-version explicitly, or remove -Xuse-old-backend -warning: -Xuse-old-backend is deprecated and will be removed in a future release -error: -Xabi-stability=unstable is not supported in the old JVM backend +error: -Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/oldBackendLv16.out b/compiler/testData/cli/jvm/oldBackendLv16.out deleted file mode 100644 index ed485d5266d..00000000000 --- a/compiler/testData/cli/jvm/oldBackendLv16.out +++ /dev/null @@ -1,2 +0,0 @@ -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 -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/oldBackendWithScript.args b/compiler/testData/cli/jvm/oldBackendWithScript.args new file mode 100644 index 00000000000..37c73cf7180 --- /dev/null +++ b/compiler/testData/cli/jvm/oldBackendWithScript.args @@ -0,0 +1,5 @@ +$TESTDATA_DIR$/hello.kts +-d +$TEMP_DIR$ +-Xuse-old-backend +-script diff --git a/compiler/testData/cli/jvm/oldBackendWithScript.out b/compiler/testData/cli/jvm/oldBackendWithScript.out new file mode 100644 index 00000000000..4bc7baa473c --- /dev/null +++ b/compiler/testData/cli/jvm/oldBackendWithScript.out @@ -0,0 +1,3 @@ +warning: language version is automatically inferred to 1.5 when using the old JVM backend. Consider specifying -language-version explicitly, or remove -Xuse-old-backend +warning: -Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend +OK diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args deleted file mode 100644 index ce9cc3c58b8..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/suspendInFunInterfaceDefault.kt --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt deleted file mode 100644 index dc7eb99909e..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun interface FIC { - suspend fun foo() -} diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.args b/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.args deleted file mode 100644 index eb4de6c6b8a..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.args +++ /dev/null @@ -1,6 +0,0 @@ -$TESTDATA_DIR$/suspendInFunInterfaceIrDisabled.kt --d -$TEMP_DIR$ --Xuse-old-backend --language-version -1.5 diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.kt b/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.kt deleted file mode 100644 index dc7eb99909e..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun interface FIC { - suspend fun foo() -} diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.out b/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.out deleted file mode 100644 index 991e8e311ac..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.out +++ /dev/null @@ -1,5 +0,0 @@ -warning: -Xuse-old-backend is deprecated and will be removed in a future release -compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.kt:2:5: error: 'suspend' modifier is not allowed on a single abstract member - suspend fun foo() - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.args b/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.args deleted file mode 100644 index 72b35ae22ea..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.args +++ /dev/null @@ -1,4 +0,0 @@ -$TESTDATA_DIR$/suspendInFunInterfaceIrEnabled.kt --d -$TEMP_DIR$ --Xuse-ir diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.kt b/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.kt deleted file mode 100644 index dc7eb99909e..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun interface FIC { - suspend fun foo() -} diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.out b/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index f560c88c6ea..03057e57ef0 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -138,11 +138,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/abiStabilityIncorrectValue.args"); } - @TestMetadata("abiStabilityUnstableWithOldBackend.args") - public void testAbiStabilityUnstableWithOldBackend() throws Exception { - runTest("compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args"); - } - public void testAllFilesPresentInJvm() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), null, false); } @@ -207,11 +202,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/argumentPassedMultipleTimes.args"); } - @TestMetadata("bothJvmIrAndOldBackend.args") - public void testBothJvmIrAndOldBackend() throws Exception { - runTest("compiler/testData/cli/jvm/bothJvmIrAndOldBackend.args"); - } - @TestMetadata("builderInferenceByDefault.args") public void testBuilderInferenceByDefault() throws Exception { runTest("compiler/testData/cli/jvm/builderInferenceByDefault.args"); @@ -927,9 +917,14 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/nullabilityAnnotations.args"); } - @TestMetadata("oldBackendLv16.args") - public void testOldBackendLv16() throws Exception { - runTest("compiler/testData/cli/jvm/oldBackendLv16.args"); + @TestMetadata("oldBackend.args") + public void testOldBackend() throws Exception { + runTest("compiler/testData/cli/jvm/oldBackend.args"); + } + + @TestMetadata("oldBackendWithScript.args") + public void testOldBackendWithScript() throws Exception { + runTest("compiler/testData/cli/jvm/oldBackendWithScript.args"); } @TestMetadata("optInEmptyMessage.args") @@ -1042,21 +1037,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/suppressAllWarningsJvm.args"); } - @TestMetadata("suspendInFunInterfaceDefault.args") - public void testSuspendInFunInterfaceDefault() throws Exception { - runTest("compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args"); - } - - @TestMetadata("suspendInFunInterfaceIrDisabled.args") - public void testSuspendInFunInterfaceIrDisabled() throws Exception { - runTest("compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.args"); - } - - @TestMetadata("suspendInFunInterfaceIrEnabled.args") - public void testSuspendInFunInterfaceIrEnabled() throws Exception { - runTest("compiler/testData/cli/jvm/suspendInFunInterfaceIrEnabled.args"); - } - @TestMetadata("suspensionPointInMonitor.args") public void testSuspensionPointInMonitor() throws Exception { runTest("compiler/testData/cli/jvm/suspensionPointInMonitor.args"); diff --git a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt index 39c87f7def8..133be02304f 100644 --- a/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt +++ b/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt @@ -140,7 +140,6 @@ class CompilerArgumentsContentProspectorTest { K2JVMCompilerArguments::noReflect, K2JVMCompilerArguments::javaParameters, K2JVMCompilerArguments::useIR, - K2JVMCompilerArguments::useOldBackend, K2JVMCompilerArguments::allowUnstableDependencies, K2JVMCompilerArguments::doNotClearBindingContext, K2JVMCompilerArguments::noCallAssertions, diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index 4b0384cfdce..29b118c48da 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -29,10 +29,4 @@ interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption * Default value: false */ var noJdk: kotlin.Boolean - - /** - * Use the old JVM backend - * Default value: false - */ - var useOldBackend: kotlin.Boolean } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index ca3e1b474d8..50d7f1b6360 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -151,7 +151,6 @@ internal open class GradleCompilerRunner( parseCommandLineArguments(argsArray.toList(), args) report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR) report(StringMetrics.JVM_DEFAULTS, args.jvmDefault) - report(StringMetrics.USE_OLD_BACKEND, args.useOldBackend.toString()) report(StringMetrics.USE_FIR, args.useK2.toString()) val pluginPatterns = listOf(Pair(BooleanMetrics.ENABLED_COMPILER_PLUGIN_ALL_OPEN, "kotlin-allopen-.*jar"), diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt index 36680d4f12f..7ff539cabe7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt @@ -55,13 +55,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K noJdkField = value } - private var useOldBackendField: kotlin.Boolean? = null - override var useOldBackend: kotlin.Boolean - get() = useOldBackendField ?: false - set(value) { - useOldBackendField = value - } - internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) { allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it } suppressWarningsField?.let { args.suppressWarnings = it } @@ -73,7 +66,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K jvmTarget?.let { args.jvmTarget = it } moduleName?.let { args.moduleName = it } noJdkField?.let { args.noJdk = it } - useOldBackendField?.let { args.useOldBackend = it } } } @@ -88,7 +80,6 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi jvmTarget = null moduleName = null noJdk = false - useOldBackend = false noStdlib = true noReflect = true } diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/errorReporting.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/errorReporting.kt index 61795b67964..414d642025c 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/errorReporting.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/errorReporting.kt @@ -134,7 +134,6 @@ internal fun reportArgumentsNotAllowed( reportingState, K2JVMCompilerArguments::useJavac, K2JVMCompilerArguments::useIR, - K2JVMCompilerArguments::useOldBackend, K2JVMCompilerArguments::useK2 )