From 91cf09dc3b68610633cb9b2038ff38b176b66a50 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Dec 2016 11:28:08 +0300 Subject: [PATCH] Fix test on IS_PRE_RELEASE Use DeserializedDescriptorResolver.IS_PRE_RELEASE instead of KotlinCompilerVersion.IS_PRE_RELEASE because the former is updated correctly in tests (cherry picked from commit 95b4b6e7d92b112603be9f8243aac9c39be7df67) --- .../src/org/jetbrains/kotlin/codegen/writeAnnotationUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/writeAnnotationUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/writeAnnotationUtil.kt index d9c485cfd9c..abacc3a6df7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/writeAnnotationUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/writeAnnotationUtil.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.org.objectweb.asm.AnnotationVisitor @@ -28,7 +29,7 @@ fun writeKotlinMetadata(cb: ClassBuilder, kind: KotlinClassHeader.Kind, extraFla av.visit(JvmAnnotationNames.METADATA_VERSION_FIELD_NAME, JvmMetadataVersion.INSTANCE.toArray()) av.visit(JvmAnnotationNames.BYTECODE_VERSION_FIELD_NAME, JvmBytecodeBinaryVersion.INSTANCE.toArray()) av.visit(JvmAnnotationNames.KIND_FIELD_NAME, kind.id) - val flags = extraFlags or (if (KotlinCompilerVersion.IS_PRE_RELEASE) JvmAnnotationNames.METADATA_PRE_RELEASE_FLAG else 0) + val flags = extraFlags or (if (DeserializedDescriptorResolver.IS_PRE_RELEASE) JvmAnnotationNames.METADATA_PRE_RELEASE_FLAG else 0) if (flags != 0) { av.visit(JvmAnnotationNames.METADATA_EXTRA_INT_FIELD_NAME, flags) }