From 3c4e5d761581559249ed1e8ccf7e0645a587bf81 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 17 Jan 2020 20:35:46 +0100 Subject: [PATCH] Fix JvmFieldInInterfaceCompanion.kt for language version 1.4 Since 1.4, constant value is no longer written to the class file (and thus cannot be read) for non-const properties. But in sources, corresponding property descriptors still have the initializer which is rendered to text. Therefore we disable the source-vs-binary check and update the test data to check the new behavior. --- .../annotations/JvmFieldInInterfaceCompanion.kt | 2 +- .../annotations/JvmFieldInInterfaceCompanion.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt index a7313292af6..6193a2ec541 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JVM_IR +// NO_CHECK_SOURCE_VS_BINARY package test diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.txt index c8084b8b284..ebf063ed944 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.txt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.txt @@ -4,9 +4,9 @@ public interface I { public companion object Companion { /*primary*/ private constructor Companion() - @field:kotlin.jvm.JvmField public final val x: kotlin.String = "x" + @field:kotlin.jvm.JvmField public final val x: kotlin.String public final fun (): kotlin.String - @field:kotlin.jvm.JvmField public final val y: kotlin.String = "y" + @field:kotlin.jvm.JvmField public final val y: kotlin.String public final fun (): kotlin.String } }