Rename -Xno-use-ir -> -Xuse-old-backend, add Gradle option
As soon as JVM IR is enabled by default (in language version 1.5), use the CLI argument `-Xuse-old-backend` or Gradle option `useOldBackend` to switch to the old JVM backend.
This commit is contained in:
@@ -51,7 +51,8 @@ tasks {
|
||||
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
|
||||
"-Xcoroutines=enable",
|
||||
"-XXLanguage:-ReleaseCoroutines",
|
||||
"-Xno-use-ir"
|
||||
"-Xno-use-ir",
|
||||
"-Xuse-old-backend"
|
||||
)
|
||||
moduleName = "kotlin-coroutines-experimental-compat"
|
||||
}
|
||||
@@ -62,7 +63,8 @@ tasks {
|
||||
apiVersion = "1.2"
|
||||
freeCompilerArgs = listOf(
|
||||
"-Xcoroutines=enable",
|
||||
"-Xno-use-ir"
|
||||
"-Xno-use-ir",
|
||||
"-Xuse-old-backend"
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -71,7 +73,8 @@ tasks {
|
||||
languageVersion = "1.3"
|
||||
apiVersion = "1.3"
|
||||
freeCompilerArgs = listOf(
|
||||
"-Xno-use-ir"
|
||||
"-Xno-use-ir",
|
||||
"-Xuse-old-backend"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -17,4 +17,4 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
|
||||
* Default value: null
|
||||
*/
|
||||
var languageVersion: kotlin.String?
|
||||
}
|
||||
}
|
||||
|
||||
+6
@@ -58,4 +58,10 @@ interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption
|
||||
* Default value: false
|
||||
*/
|
||||
var useIR: kotlin.Boolean
|
||||
|
||||
/**
|
||||
* Use the old JVM backend
|
||||
* Default value: false
|
||||
*/
|
||||
var useOldBackend: kotlin.Boolean
|
||||
}
|
||||
|
||||
+9
@@ -102,6 +102,13 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
||||
useIRField = 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 }
|
||||
@@ -117,6 +124,7 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
||||
noReflectField?.let { args.noReflect = it }
|
||||
noStdlibField?.let { args.noStdlib = it }
|
||||
useIRField?.let { args.useIR = it }
|
||||
useOldBackendField?.let { args.useOldBackend = it }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,4 +143,5 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
|
||||
noReflect = true
|
||||
noStdlib = true
|
||||
useIR = false
|
||||
useOldBackend = false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user