Remove obsolete compiler flag -Xuse-ir
This commit is contained in:
committed by
Space Team
parent
2951e0b955
commit
60016d3e5b
-1
@@ -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
|
||||
|
||||
-10
@@ -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")
|
||||
|
||||
|
||||
-1
@@ -16,7 +16,6 @@ internal val LANGUAGE_VERSION_K1: String = System.getProperty("fir.bench.languag
|
||||
class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
||||
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
|
||||
args.useK2 = false
|
||||
args.useIR = true
|
||||
args.languageVersion = LANGUAGE_VERSION_K1
|
||||
// TODO: Remove when support for old modularized tests is removed
|
||||
if (moduleData.arguments == null) {
|
||||
|
||||
-1
@@ -18,7 +18,6 @@ internal val LANGUAGE_VERSION_K2: String = System.getProperty("fir.bench.languag
|
||||
class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
|
||||
|
||||
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
|
||||
args.useIR = true
|
||||
args.languageVersion = LANGUAGE_VERSION_K2
|
||||
|
||||
// TODO: Remove when support for old modularized tests is removed
|
||||
|
||||
-1
@@ -14,7 +14,6 @@ abstract class AbstractIncrementalFirICLightTreeJvmCompilerRunnerTest : Abstract
|
||||
super.createCompilerArguments(destinationDir, testDir).apply {
|
||||
useK2 = true
|
||||
languageVersion = "2.0"
|
||||
useIR = true
|
||||
useFirIC = true
|
||||
useFirLT = true
|
||||
}
|
||||
|
||||
-1
@@ -25,7 +25,6 @@ abstract class AbstractIncrementalFirJvmCompilerRunnerTest : AbstractIncremental
|
||||
super.createCompilerArguments(destinationDir, testDir).apply {
|
||||
useK2 = true
|
||||
languageVersion = "2.0"
|
||||
useIR = true
|
||||
}
|
||||
|
||||
override val buildLogFinder: BuildLogFinder
|
||||
|
||||
-1
@@ -14,7 +14,6 @@ abstract class AbstractIncrementalFirLightTreeJvmCompilerRunnerTest : AbstractIn
|
||||
super.createCompilerArguments(destinationDir, testDir).apply {
|
||||
useK2 = true
|
||||
languageVersion = "2.0"
|
||||
useIR = true
|
||||
useFirIC = false
|
||||
useFirLT = true
|
||||
}
|
||||
|
||||
-1
@@ -141,7 +141,6 @@ where advanced options include:
|
||||
including freshly supported reading of the type use annotations from class files.
|
||||
See KT-45671 for more details
|
||||
-Xuse-fast-jar-file-system Use fast implementation on Jar FS. This may speed up compilation time, but currently it's an experimental mode
|
||||
-Xuse-ir Use the IR backend. This option has no effect unless the language version less than 1.5 is used
|
||||
-Xuse-javac Use javac for Java source and class files analysis
|
||||
-Xuse-old-backend Use the old JVM backend
|
||||
-Xuse-old-class-files-reading Use old class files reading implementation. This may slow down the build and cause problems with Groovy interop.
|
||||
|
||||
@@ -620,11 +620,6 @@ public class CliTestGenerated extends AbstractCliTest {
|
||||
runTest("compiler/testData/cli/jvm/inlineCycle.args");
|
||||
}
|
||||
|
||||
@TestMetadata("inlineCycle_ir.args")
|
||||
public void testInlineCycle_ir() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/inlineCycle_ir.args");
|
||||
}
|
||||
|
||||
@TestMetadata("instanceAccessBeforeSuperCall.args")
|
||||
public void testInstanceAccessBeforeSuperCall() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.args");
|
||||
@@ -685,11 +680,6 @@ public class CliTestGenerated extends AbstractCliTest {
|
||||
runTest("compiler/testData/cli/jvm/invalidMetadataVersion.args");
|
||||
}
|
||||
|
||||
@TestMetadata("irSupported.args")
|
||||
public void testIrSupported() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/irSupported.args");
|
||||
}
|
||||
|
||||
@TestMetadata("javaSealedClass.args")
|
||||
public void testJavaSealedClass() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/javaSealedClass.args");
|
||||
@@ -995,11 +985,6 @@ public class CliTestGenerated extends AbstractCliTest {
|
||||
runTest("compiler/testData/cli/jvm/nonLocalDisabled.args");
|
||||
}
|
||||
|
||||
@TestMetadata("nonLocalDisabled_ir.args")
|
||||
public void testNonLocalDisabled_ir() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/nonLocalDisabled_ir.args");
|
||||
}
|
||||
|
||||
@TestMetadata("nonexistentPathInModule.args")
|
||||
public void testNonexistentPathInModule() throws Exception {
|
||||
runTest("compiler/testData/cli/jvm/nonexistentPathInModule.args");
|
||||
|
||||
Reference in New Issue
Block a user