diff --git a/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt b/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt new file mode 100644 index 00000000000..b18518462d1 --- /dev/null +++ b/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt @@ -0,0 +1,4 @@ +class A { + val OK: String = "OK" + @JvmName("OK") get +} \ No newline at end of file diff --git a/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.B.kt b/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.B.kt new file mode 100644 index 00000000000..b03e296ba08 --- /dev/null +++ b/compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.B.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + if (A().OK != "OK") throw java.lang.AssertionError() +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index d66095fe00b..756c525b8da 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -101,6 +101,12 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl doTest(fileName); } + @TestMetadata("JvmNameOnAccessor.A.kt") + public void testJvmNameOnAccessor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt"); + doTest(fileName); + } + @TestMetadata("KotlinPropertyAsAnnotationParameter.A.kt") public void testKotlinPropertyAsAnnotationParameter() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt"); diff --git a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt index b5e6ee6d013..38c1487e969 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt @@ -48,7 +48,7 @@ public annotation class JvmStatic * @property name the name of the element. */ @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.FILE) -@Retention(AnnotationRetention.SOURCE) +@Retention(AnnotationRetention.BINARY) @MustBeDocumented public annotation class JvmName(public val name: String)