diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt index b211ff1546f..857978cce55 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt @@ -75,8 +75,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate( sameSignature(function, resolveMethod) }?.annotations?.filterIsInstance() resolverMethodAnnotations?.flatMap { - val v = it.supportedAnnotationClasses - v.toList() // TODO: inline after KT-9453 is resolved (now it fails with "java.lang.Class cannot be cast to kotlin.reflect.KClass") + it.supportedAnnotationClasses.toList() } ?: emptyList() } diff --git a/compiler/testData/codegen/box/reflection/createAnnotation/arrayOfKClasses.kt b/compiler/testData/codegen/box/reflection/createAnnotation/arrayOfKClasses.kt index 054ea5fc4cf..2be3e82667f 100644 --- a/compiler/testData/codegen/box/reflection/createAnnotation/arrayOfKClasses.kt +++ b/compiler/testData/codegen/box/reflection/createAnnotation/arrayOfKClasses.kt @@ -10,7 +10,7 @@ annotation class Anno(val klasses: Array> = arrayOf(String::class, Int fun box(): String { val anno = Anno::class.constructors.single().callBy(emptyMap()) - assertEquals(listOf(String::class, Int::class), (anno.klasses as Array>).toList() /* TODO: KT-9453 */) + assertEquals(listOf(String::class, Int::class), anno.klasses.toList()) assertEquals("@Anno(klasses=[class java.lang.String, int])", anno.toString()) return "OK" } diff --git a/compiler/testData/codegen/box/reflection/createAnnotation/callByKotlin.kt b/compiler/testData/codegen/box/reflection/createAnnotation/callByKotlin.kt index f1c1934d25b..c0bb6c81133 100644 --- a/compiler/testData/codegen/box/reflection/createAnnotation/callByKotlin.kt +++ b/compiler/testData/codegen/box/reflection/createAnnotation/callByKotlin.kt @@ -42,7 +42,7 @@ fun box(): String { assertFails { create(mapOf("s" to "Fail", "x" to "Fail")) } val t5 = create(mapOf("string" to "OK")) - assertEquals(Number::class, t5.klass as KClass<*> /* TODO: KT-9453 */) + assertEquals(Number::class, t5.klass) assertFails("KClass (not Class) instances should be passed as arguments") { create(mapOf("klass" to String::class.java, "string" to "Fail")) diff --git a/compiler/testData/codegen/box/reflection/createAnnotation/callKotlin.kt b/compiler/testData/codegen/box/reflection/createAnnotation/callKotlin.kt index b4c197f4abd..b667f40304c 100644 --- a/compiler/testData/codegen/box/reflection/createAnnotation/callKotlin.kt +++ b/compiler/testData/codegen/box/reflection/createAnnotation/callKotlin.kt @@ -32,7 +32,7 @@ fun box(): String { } val k = create("OK", Int::class) - assertEquals(Int::class, k.klass as KClass<*> /* TODO: KT-9453 */) + assertEquals(Int::class, k.klass) return k.string }