Skip to content

Commit 52d11eb

Browse files
committed
Minor. Revert workarounds for problem on KClass from annotation
See KT-9453 for clarification
1 parent 82d7a26 commit 52d11eb

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
7575
sameSignature(function, resolveMethod)
7676
}?.annotations?.filterIsInstance<AcceptedAnnotations>()
7777
resolverMethodAnnotations?.flatMap {
78-
val v = it.supportedAnnotationClasses
79-
v.toList() // TODO: inline after KT-9453 is resolved (now it fails with "java.lang.Class cannot be cast to kotlin.reflect.KClass")
78+
it.supportedAnnotationClasses.toList()
8079
}
8180
?: emptyList()
8281
}

compiler/testData/codegen/box/reflection/createAnnotation/arrayOfKClasses.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ annotation class Anno(val klasses: Array<KClass<*>> = arrayOf(String::class, Int
1010

1111
fun box(): String {
1212
val anno = Anno::class.constructors.single().callBy(emptyMap())
13-
assertEquals(listOf(String::class, Int::class), (anno.klasses as Array<KClass<*>>).toList() /* TODO: KT-9453 */)
13+
assertEquals(listOf(String::class, Int::class), anno.klasses.toList())
1414
assertEquals("@Anno(klasses=[class java.lang.String, int])", anno.toString())
1515
return "OK"
1616
}

compiler/testData/codegen/box/reflection/createAnnotation/callByKotlin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fun box(): String {
4242
assertFails { create<TwoParamsOneDefault>(mapOf("s" to "Fail", "x" to "Fail")) }
4343

4444
val t5 = create<TwoParamsOneDefaultKClass>(mapOf("string" to "OK"))
45-
assertEquals(Number::class, t5.klass as KClass<*> /* TODO: KT-9453 */)
45+
assertEquals(Number::class, t5.klass)
4646

4747
assertFails("KClass (not Class) instances should be passed as arguments") {
4848
create<TwoNonDefaults>(mapOf("klass" to String::class.java, "string" to "Fail"))

compiler/testData/codegen/box/reflection/createAnnotation/callKotlin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fun box(): String {
3232
}
3333

3434
val k = create<TwoNonDefaults>("OK", Int::class)
35-
assertEquals(Int::class, k.klass as KClass<*> /* TODO: KT-9453 */)
35+
assertEquals(Int::class, k.klass)
3636

3737
return k.string
3838
}

0 commit comments

Comments
 (0)