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

Do not generate annotations of method parameters on its $default synthetic method

Browse Source 
#KT-7892 Fixed
This commit is contained in:
Alexander Udalov
2015-06-01 11:57:41 +03:00
parent 4f77b44ac3
commit 28addcf8e7
6 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
Vendored
+11 -18
View File
@@ -1,43 +1,36 @@
import java.lang.annotation.*
import kotlin.reflect.jvm.java
import kotlin.test.assertEquals
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val x: Int)
class A {
Ann(1) fun foo(Ann(2) x: Int, y: Int = 2, Ann(3) z: Int) {}
Ann(1) fun foo(x: Int, y: Int = 2, z: Int) {}
Ann(1) constructor(Ann(2) x: Int, y: Int = 2, Ann(3) z: Int)
Ann(1) constructor(x: Int, y: Int = 2, z: Int)
}
class B [Ann(1)] (Ann(2) x: Int, y: Int = 2, Ann(3) z: Int) {}
class B @Ann(1) constructor(x: Int, y: Int = 2, z: Int) {}
fun Array<out Annotation>.ann() = filterIsInstance<Ann>()
fun test(name: String, annotations: Array<out Annotation>, parameters: Array<out Array<out Annotation>>) {
assertEquals(1, annotations.ann()[0].x, "$name[0]")
assertEquals(2, parameters[0].ann()[0].x, "$name-param[0]")
assertEquals(0, parameters[1].ann().size(), "$name-param[1]")
assertEquals(3, parameters[2].ann()[0].x, "$name-param[2]")
fun test(name: String, annotations: Array<out Annotation>) {
assertEquals(1, annotations.filterIsInstance<Ann>().single().x, "$name[0]")
}
fun box(): String {
val foo = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo" }
test("foo", foo.getDeclaredAnnotations(), foo.getParameterAnnotations())
test("foo", foo.getDeclaredAnnotations())
val fooDefault = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo\$default" }
test("foo", foo.getDeclaredAnnotations(), foo.getParameterAnnotations())
test("foo", foo.getDeclaredAnnotations())
val (secondary, secondaryDefault) = javaClass<A>().getDeclaredConstructors().partition { it.getParameterTypes().size() == 3 }
test("secondary", secondary[0].getDeclaredAnnotations(), secondary[0].getParameterAnnotations())
test("secondary\$default", secondaryDefault[0].getDeclaredAnnotations(), secondaryDefault[0].getParameterAnnotations())
test("secondary", secondary[0].getDeclaredAnnotations())
test("secondary\$default", secondaryDefault[0].getDeclaredAnnotations())
val (primary, primaryDefault) = javaClass<B>().getConstructors().partition { it.getParameterTypes().size() == 3 }
test("primary", primary[0].getDeclaredAnnotations(), primary[0].getParameterAnnotations())
test("secondary\$default", primaryDefault[0].getDeclaredAnnotations(), primaryDefault[0].getParameterAnnotations())
test("primary", primary[0].getDeclaredAnnotations())
test("primary\$default", primaryDefault[0].getDeclaredAnnotations())
return "OK"
}