Support type annotations

#KT-35843 Fixed
2019-12-30 09:12:28 +01:00
parent fde9b21a40
commit 2ed0cb2a89
52 changed files with 1728 additions and 10 deletions
@@ -0,0 +1,66 @@
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND: JVM_IR
+// JVM_TARGET: 1.8
+// WITH_REFLECT
+// FULL_JDK
+
+// FILE: A.kt
+
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.jvm.javaMethod
+import kotlin.test.fail
+
+@Target(AnnotationTarget.TYPE)
+annotation class TypeAnn
+
+fun bar(): @TypeAnn String = "OK"
+
+// FILE: B.kt
+
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.jvm.javaMethod
+import kotlin.reflect.jvm.javaField
+import kotlin.test.fail
+
+class Kotlin {
+
+    fun foo() = bar()
+
+    @JvmField
+    val field = bar()
+}
+
+fun box(): String {
+
+    checkTypeAnnotation(
+        Kotlin::foo.javaMethod!!.annotatedReturnType,
+        "class java.lang.String",
+        "@TypeAnn()",
+        "foo"
+    )
+
+    checkTypeAnnotation(
+        Kotlin::field.javaField!!.annotatedType,
+        "class java.lang.String",
+        "@TypeAnn()",
+        "foo"
+    )
+
+    return Kotlin().foo()
+}
+
+fun checkTypeAnnotation(
+    annotatedType: AnnotatedType,
+    type: String,
+    annotations: String,
+    message: String
+) {
+    if (annotatedType.annotation() != annotations) fail("check $message (1): ${annotatedType.annotation()} != $annotations")
+
+    if (annotatedType.type.toString() != type) fail("check $message (2): ${annotatedType.type} != $type")
+}
+
+
+fun AnnotatedType.annotation() = annotations.joinToString()
@@ -0,0 +1,60 @@
+// KOTLIN_CONFIGURATION_FLAGS: +JVM.EMIT_JVM_TYPE_ANNOTATIONS
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND_FIR: JVM_IR
+// WITH_REFLECT
+// FULL_JDK
+
+// FILE: A.kt
+// JVM_TARGET: 1.6
+
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.jvm.javaMethod
+import kotlin.test.fail
+
+@Target(AnnotationTarget.TYPE)
+annotation class TypeAnn
+
+// FILE: B.kt
+// JVM_TARGET: 1.8
+
+import java.lang.reflect.AnnotatedType
+import kotlin.reflect.jvm.javaMethod
+import kotlin.test.fail
+
+class Kotlin {
+
+    fun foo(s: @TypeAnn String) {
+    }
+
+    fun foo2(): @TypeAnn String {
+        return "OK"
+    }
+}
+
+fun box(): String {
+
+    checkTypeAnnotation(
+        Kotlin::foo.javaMethod!!.annotatedParameterTypes.single(),
+        "class java.lang.String",
+        "",
+        "foo"
+    )
+
+    checkTypeAnnotation(Kotlin::foo2.javaMethod!!.annotatedReturnType, "class java.lang.String", "", "foo2")
+
+    return "OK"
+}
+
+fun checkTypeAnnotation(
+    annotatedType: AnnotatedType,
+    type: String,
+    annotations: String,
+    message: String
+) {
+    if (annotatedType.annotation() != annotations) fail("check $message (1): ${annotatedType.annotation()} != $annotations")
+
+    if (annotatedType.type.toString() != type) fail("check $message (2): ${annotatedType.type} != $type")
+}
+
+
+fun AnnotatedType.annotation() = annotations.joinToString()