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

Inherit KType from KAnnotatedElement, implement KType.annotations

Browse Source 
#KT-16795 Fixed
This commit is contained in:
Alexander Udalov
2018-08-03 18:02:23 +02:00
committed by Ilya Gorbunov
parent e4bbe2d5e2
commit ceb909d261
14 changed files with 280 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/annotations/onTypes/differentArgumentTypes.kt
Vendored
+75
View File
@@ -0,0 +1,75 @@
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
// WITH_REFLECT
import kotlin.reflect.KClass
import kotlin.test.assertEquals
annotation class Nested(val value: String)
@Target(AnnotationTarget.TYPE)
annotation class Anno(
val b: Byte,
val c: Char,
val d: Double,
val f: Float,
val i: Int,
val j: Long,
val s: Short,
val z: Boolean,
val ba: ByteArray,
val ca: CharArray,
val da: DoubleArray,
val fa: FloatArray,
val ia: IntArray,
val ja: LongArray,
val sa: ShortArray,
val za: BooleanArray,
val str: String,
val k: KClass<*>,
val e: AnnotationTarget,
val a: Nested,
val stra: Array<String>,
// val ka: Array<KClass<*>>, // Arrays of class literals are not supported yet in AnnotationDeserializer
val ea: Array<AnnotationTarget>,
val aa: Array<Nested>
)
fun f(): @Anno(
1.toByte(),
'x',
3.14,
-2.72f,
42424242,
239239239239239L,
42.toShort(),
true,
[(-1).toByte()],
['y'],
[-3.14159],
[2.7218f],
[424242],
[239239239239L],
[(-43).toShort()],
[false, true],
"lol",
Number::class,
AnnotationTarget.EXPRESSION,
Nested("1"),
["lmao"],
// [Double::class, Unit::class],
[AnnotationTarget.TYPEALIAS, AnnotationTarget.FIELD],
[Nested("2"), Nested("3")]
) Unit {}
fun box(): String {
assertEquals(
"[@Anno(b=1, c=x, d=3.14, f=-2.72, i=42424242, j=239239239239239, s=42, z=true, " +
"ba=[-1], ca=[y], da=[-3.14159], fa=[2.7218], ia=[424242], ja=[239239239239], sa=[-43], za=[false, true], " +
"str=lol, k=class java.lang.Number, e=EXPRESSION, a=@Nested(value=1), " +
"stra=[lmao], ea=[TYPEALIAS, FIELD], aa=[@Nested(value=2), @Nested(value=3)])]",
::f.returnType.annotations.toString()
)
return "OK"
}
compiler/testData/codegen/box/reflection/annotations/onTypes/differentPositions.kt
Vendored
+49
View File
@@ -0,0 +1,49 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: JVM_IR
// WITH_REFLECT
import kotlin.reflect.KCallable
import kotlin.reflect.KType
@Target(AnnotationTarget.TYPE)
annotation class InRange(val from: Int, val to: Int)
val propertyType: @InRange(1, 10) Int = 5
fun functionType(): @InRange(1, 10) Int = 5
fun parameterType(param: @InRange(1, 10) Int) {}
fun (@InRange(1, 10) Int).receiverType() {}
abstract class Supertype : @InRange(1, 10) Number() {
fun <T : @InRange(1, 10) Number> typeParameterBound(t: T): T = t
inner class Inner
}
fun typeArgument(): List<@InRange(1, 10) Int>? = null
// -------
private fun check(what: String, type: KType) {
val annotations = type.annotations
if (annotations.isEmpty()) throw AssertionError("No annotations found on $what")
val a = annotations.single() as InRange
if (a.from != 1 || a.to != 10) throw AssertionError("Incorrect from/to values: ${a.from} ${a.to}")
}
fun box(): String {
check("property return type", ::propertyType.returnType)
check("function return type", ::functionType.returnType)
check("parameter type", ::parameterType.parameters.single().type)
check("receiver type", Int::receiverType.parameters.single().type)
check("supertype", Supertype::class.supertypes.single())
val typeParameterBound = Supertype::class.members.single { it.name == "typeParameterBound" } as KCallable
check("type parameter bound", typeParameterBound.typeParameters.single().upperBounds.single())
check("type argument", ::typeArgument.returnType.arguments.single().type!!)
return "OK"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+23
View File
@@ -17370,6 +17370,29 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
public void testSimpleValAnnotation() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/simpleValAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/annotations/onTypes")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OnTypes extends AbstractBlackBoxCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInOnTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/annotations/onTypes"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("differentArgumentTypes.kt")
public void testDifferentArgumentTypes() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentArgumentTypes.kt");
}
@TestMetadata("differentPositions.kt")
public void testDifferentPositions() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentPositions.kt");
}
}
}
@TestMetadata("compiler/testData/codegen/box/reflection/builtins")
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+23
View File
@@ -17370,6 +17370,29 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
public void testSimpleValAnnotation() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/simpleValAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/annotations/onTypes")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OnTypes extends AbstractLightAnalysisModeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInOnTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/annotations/onTypes"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("differentArgumentTypes.kt")
public void testDifferentArgumentTypes() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentArgumentTypes.kt");
}
@TestMetadata("differentPositions.kt")
public void testDifferentPositions() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentPositions.kt");
}
}
}
@TestMetadata("compiler/testData/codegen/box/reflection/builtins")
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+23
View File
@@ -17370,6 +17370,29 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
public void testSimpleValAnnotation() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/simpleValAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/annotations/onTypes")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OnTypes extends AbstractIrBlackBoxCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInOnTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/annotations/onTypes"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM_IR, true);
}
@TestMetadata("differentArgumentTypes.kt")
public void testDifferentArgumentTypes() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentArgumentTypes.kt");
}
@TestMetadata("differentPositions.kt")
public void testDifferentPositions() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/onTypes/differentPositions.kt");
}
}
}
@TestMetadata("compiler/testData/codegen/box/reflection/builtins")
core/builtins/src/kotlin/reflect/KType.kt
+1 -1
View File
@@ -20,7 +20,7 @@ package kotlin.reflect
* Represents a type. Type is usually either a class with optional type arguments,
* or a type parameter of some declaration, plus nullability.
*/
public interface KType {
public interface KType : KAnnotatedElement {
/**
* The declaration of the classifier used in this type.
* For example, in the type `List<String>` the classifier would be the [KClass] instance for [List].
core/reflection.jvm/src/kotlin/reflect/jvm/internal/AnnotationConstructorCaller.kt
+10 -3
View File
@@ -61,7 +61,7 @@ internal class AnnotationConstructorCaller(
value ?: throwIllegalArgumentType(index, parameterNames[index], erasedParameterTypes[index])
}
return createAnnotationInstance(jClass, methods, parameterNames.zip(values).toMap())
return createAnnotationInstance(jClass, parameterNames.zip(values).toMap(), methods)
}
}
@@ -101,7 +101,11 @@ private fun throwIllegalArgumentType(index: Int, name: String, expectedJvmType:
throw IllegalArgumentException("Argument #$index $name is not of the required type $typeString")
}
private fun createAnnotationInstance(annotationClass: Class<*>, methods: List<ReflectMethod>, values: Map<String, Any>): Any {
internal fun <T : Any> createAnnotationInstance(
annotationClass: Class<T>,
values: Map<String, Any>,
methods: List<ReflectMethod> = values.keys.map { name -> annotationClass.getDeclaredMethod(name) }
): T {
fun equals(other: Any?): Boolean =
(other as? Annotation)?.annotationClass?.java == annotationClass &&
methods.all { method ->
@@ -163,7 +167,7 @@ private fun createAnnotationInstance(annotationClass: Class<*>, methods: List<Re
}
}
return Proxy.newProxyInstance(annotationClass.classLoader, arrayOf(annotationClass)) { _, method, args ->
val result = Proxy.newProxyInstance(annotationClass.classLoader, arrayOf(annotationClass)) { _, method, args ->
val name = method.name
when (name) {
"annotationType" -> annotationClass
@@ -176,4 +180,7 @@ private fun createAnnotationInstance(annotationClass: Class<*>, methods: List<Re
}
}
}
@Suppress("UNCHECKED_CAST")
return result as T
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt
+3
View File
@@ -112,6 +112,9 @@ internal class KTypeImpl(
override val isMarkedNullable: Boolean
get() = type.isMarkedNullable
override val annotations: List<Annotation>
get() = type.computeAnnotations()
override fun equals(other: Any?) =
other is KTypeImpl && type == other.type
core/reflection.jvm/src/kotlin/reflect/jvm/internal/Util.java
+13
View File
@@ -0,0 +1,13 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package kotlin.reflect.jvm.internal;
/* package */ class Util {
public static Object getEnumConstantByName(Class<? extends Enum<?>> enumClass, String name) {
// This is a workaround for KT-5191. Enum#valueOf cannot be called in Kotlin
return Enum.valueOf((Class) enumClass, name);
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+32 -1
View File
@@ -19,6 +19,7 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.annotations.isEffectivelyInlineOnly
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
@@ -30,6 +31,8 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.protobuf.MessageLite
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.constants.*
import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
import org.jetbrains.kotlin.resolve.descriptorUtil.classId
import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
@@ -102,10 +105,38 @@ internal fun Annotated.computeAnnotations(): List<Annotation> =
when (source) {
is ReflectAnnotationSource -> source.annotation
is RuntimeSourceElementFactory.RuntimeSourceElement -> (source.javaElement as? ReflectJavaAnnotation)?.annotation
else -> null
else -> it.toAnnotationInstance()
}
}
private fun AnnotationDescriptor.toAnnotationInstance(): Annotation? {
@Suppress("UNCHECKED_CAST")
val annotationClass = annotationClass?.toJavaClass() as? Class<out Annotation> ?: return null
return createAnnotationInstance(
annotationClass,
allValueArguments.entries
.mapNotNull { (name, value) -> value.toRuntimeValue(annotationClass.classLoader)?.let(name.asString()::to) }
.toMap()
)
}
// TODO: consider throwing exceptions such as AnnotationFormatError/AnnotationTypeMismatchException if a value of unexpected type is found
private fun ConstantValue<*>.toRuntimeValue(classLoader: ClassLoader): Any? = when (this) {
is AnnotationValue -> value.toAnnotationInstance()
is ArrayValue -> value.map { it.toRuntimeValue(classLoader) }.toTypedArray()
is EnumValue -> {
val (enumClassId, entryName) = value
loadClass(classLoader, enumClassId.packageFqName.asString(), enumClassId.relativeClassName.asString())?.let { enumClass ->
@Suppress("UNCHECKED_CAST")
Util.getEnumConstantByName(enumClass as Class<out Enum<*>>, entryName.asString())
}
}
is KClassValue -> (value.constructor.declarationDescriptor as? ClassDescriptor)?.toJavaClass()
is ErrorValue, is NullValue -> null
else -> value // Primitives and strings
}
// TODO: wrap other exceptions
internal inline fun <R> reflectionCall(block: () -> R): R =
try {
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+13
View File
@@ -15525,6 +15525,19 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
public void testSimpleValAnnotation() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/simpleValAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/annotations/onTypes")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OnTypes extends AbstractIrJsCodegenBoxTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
}
public void testAllFilesPresentInOnTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/annotations/onTypes"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS_IR, true);
}
}
}
@TestMetadata("compiler/testData/codegen/box/reflection/builtins")
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+13
View File
@@ -16585,6 +16585,19 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
public void testSimpleValAnnotation() throws Exception {
runTest("compiler/testData/codegen/box/reflection/annotations/simpleValAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/annotations/onTypes")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OnTypes extends AbstractJsCodegenBoxTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
}
public void testAllFilesPresentInOnTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/annotations/onTypes"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true);
}
}
}
@TestMetadata("compiler/testData/codegen/box/reflection/builtins")
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
+1 -1
View File
@@ -1293,7 +1293,7 @@ public abstract interface class kotlin/reflect/KProperty2 : kotlin/jvm/functions
public abstract interface class kotlin/reflect/KProperty2$Getter : kotlin/jvm/functions/Function2, kotlin/reflect/KProperty$Getter {
}
public abstract interface class kotlin/reflect/KType {
public abstract interface class kotlin/reflect/KType : kotlin/reflect/KAnnotatedElement {
public abstract fun getArguments ()Ljava/util/List;
public abstract fun getClassifier ()Lkotlin/reflect/KClassifier;
public abstract fun isMarkedNullable ()Z
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+1 -1
View File
@@ -4274,7 +4274,7 @@ public abstract interface class kotlin/reflect/KProperty2 : kotlin/jvm/functions
public abstract interface class kotlin/reflect/KProperty2$Getter : kotlin/jvm/functions/Function2, kotlin/reflect/KProperty$Getter {
}
public abstract interface class kotlin/reflect/KType {
public abstract interface class kotlin/reflect/KType : kotlin/reflect/KAnnotatedElement {
public abstract fun getArguments ()Ljava/util/List;
public abstract fun getClassifier ()Lkotlin/reflect/KClassifier;
public abstract fun isMarkedNullable ()Z