azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS IR: fix findAssociatedObjects for primitive type KClass'es

Browse Source
This commit is contained in:
Anton Bannykh
2020-04-28 19:08:44 +03:00
parent 878e838f0b
commit 2992d49a1d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/box/reflection/findAssociatedObject.kt
Vendored
+4
View File
@@ -93,5 +93,9 @@ fun box(): String {
if ((A::class.getAssociatedObjectByAssociated2() as I2).foo() != 20) return "fail 10" if ((A::class.getAssociatedObjectByAssociated2() as I2).foo() != 20) return "fail 10"
if (Int::class.findAssociatedObject<Associated1>() != null) return "fail 11"
if (10::class.findAssociatedObject<Associated2>() != null) return "fail 12"
return "OK" return "OK"
} }
libraries/stdlib/js-ir/src/kotlin/reflection_js-ir.kt
+2 -2
View File
@@ -9,8 +9,8 @@ import kotlin.reflect.js.internal.*
@PublishedApi @PublishedApi
internal fun <T : Annotation> KClass<*>.findAssociatedObject(annotationClass: KClass<T>): Any? { internal fun <T : Annotation> KClass<*>.findAssociatedObject(annotationClass: KClass<T>): Any? {
return if (this is KClassImpl<*> && annotationClass is KClassImpl<T>) { return if (this is KClassImpl<*> && annotationClass is KClassImpl<T>) {
val key = annotationClass.jClass.asDynamic().`$metadata$`.associatedObjectKey?.unsafeCast<Int>() ?: return null val key = annotationClass.jClass.asDynamic().`$metadata$`?.associatedObjectKey?.unsafeCast<Int>() ?: return null
val map = this.jClass.asDynamic().`$metadata$`.associatedObjects ?: return null val map = this.jClass.asDynamic().`$metadata$`?.associatedObjects ?: return null
val factory = map[key] ?: return null val factory = map[key] ?: return null
return factory() return factory()
} else { } else {