From d49a2ed6134bd4c645dae4cab90b7a5c43de145c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Jul 2013 19:47:16 +0400 Subject: [PATCH] Move Intrinsic annotation to javaClass property from its getter This is needed because the property, not its getter, is used as a key to the intrinsics map when codegen decides how to generate a method call. Earlier it worked because annotations on getters of properties loaded from bytecode were mistakenly added to annotations on properties themselves --- libraries/stdlib/src/kotlin/JLangJVM.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/stdlib/src/kotlin/JLangJVM.kt b/libraries/stdlib/src/kotlin/JLangJVM.kt index 41c366bff84..b71f3aced51 100644 --- a/libraries/stdlib/src/kotlin/JLangJVM.kt +++ b/libraries/stdlib/src/kotlin/JLangJVM.kt @@ -5,8 +5,8 @@ import java.lang.Object import jet.runtime.Intrinsic -public val T.javaClass : Class - [Intrinsic("kotlin.javaClass.property")] get() = (this as java.lang.Object).getClass() as Class +[Intrinsic("kotlin.javaClass.property")] public val T.javaClass : Class + get() = (this as java.lang.Object).getClass() as Class [Intrinsic("kotlin.javaClass.function")] fun javaClass() : Class = null as Class