Do not emit pre-release flag if -Xskip-metadata-version-check is used
The -Xskip-metadata-version-check command line argument is supposed to be used to avoid getting errors only; the side effect that it also caused compiler to write the pre-release flag to binaries was a mistake and is fixed now
This commit is contained in:
@@ -38,7 +38,6 @@ import org.jetbrains.kotlin.compiler.plugin.PluginCliOptionProcessingException
|
|||||||
import org.jetbrains.kotlin.compiler.plugin.cliPluginUsageString
|
import org.jetbrains.kotlin.compiler.plugin.cliPluginUsageString
|
||||||
import org.jetbrains.kotlin.config.*
|
import org.jetbrains.kotlin.config.*
|
||||||
import org.jetbrains.kotlin.load.java.JvmAbi
|
import org.jetbrains.kotlin.load.java.JvmAbi
|
||||||
import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver
|
|
||||||
import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
|
import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
|
||||||
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
|
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
|
||||||
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
|
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
|
||||||
@@ -117,8 +116,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
|
|||||||
|
|
||||||
if (arguments.skipMetadataVersionCheck) {
|
if (arguments.skipMetadataVersionCheck) {
|
||||||
JvmMetadataVersion.skipCheck = true
|
JvmMetadataVersion.skipCheck = true
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
DeserializedDescriptorResolver.IS_PRE_RELEASE = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (arguments.includeRuntime) {
|
if (arguments.includeRuntime) {
|
||||||
|
|||||||
+3
-1
@@ -74,7 +74,9 @@ class DeserializedDescriptorResolver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private val KotlinJvmBinaryClass.isPreReleaseInvisible: Boolean
|
private val KotlinJvmBinaryClass.isPreReleaseInvisible: Boolean
|
||||||
get() = !IS_PRE_RELEASE && (classHeader.isPreRelease || classHeader.metadataVersion == KOTLIN_1_1_EAP_METADATA_VERSION)
|
get() = !JvmMetadataVersion.skipCheck &&
|
||||||
|
!IS_PRE_RELEASE &&
|
||||||
|
(classHeader.isPreRelease || classHeader.metadataVersion == KOTLIN_1_1_EAP_METADATA_VERSION)
|
||||||
|
|
||||||
internal fun readData(kotlinClass: KotlinJvmBinaryClass, expectedKinds: Set<KotlinClassHeader.Kind>): Array<String>? {
|
internal fun readData(kotlinClass: KotlinJvmBinaryClass, expectedKinds: Set<KotlinClassHeader.Kind>): Array<String>? {
|
||||||
val header = kotlinClass.classHeader
|
val header = kotlinClass.classHeader
|
||||||
|
|||||||
Reference in New Issue
Block a user