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

Cache more stuff in reflection implementation

Browse Source 
Delete KAnnotatedElementImpl because it's not possible to make it a class (its
subclasses have other classes in supertypes) to cache annotations in a property
This commit is contained in:
Alexander Udalov
2016-09-08 16:11:23 +03:00
parent 80db0e4b71
commit b9dec41ea0
9 changed files with 101 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KAnnotatedElementImpl.kt
-41
View File
@@ -1,41 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.load.java.components.RuntimeSourceElementFactory
import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaAnnotation
import org.jetbrains.kotlin.load.kotlin.reflect.ReflectAnnotationSource
import kotlin.reflect.KAnnotatedElement
internal interface KAnnotatedElementImpl : KAnnotatedElement {
val annotated: Annotated
override val annotations: List<Annotation>
get() = annotated.annotations.mapNotNull {
val source = it.source
when (source) {
is ReflectAnnotationSource -> {
source.annotation
}
is RuntimeSourceElementFactory.RuntimeSourceElement -> {
(source.javaElement as? ReflectJavaAnnotation)?.annotation
}
else -> null
}
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
+43 -32
View File
@@ -18,13 +18,12 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import java.lang.reflect.Type
import java.util.*
import kotlin.reflect.*
import kotlin.reflect.jvm.javaType
internal abstract class KCallableImpl<out R> : KCallable<R>, KAnnotatedElementImpl {
internal abstract class KCallableImpl<out R> : KCallable<R> {
abstract val descriptor: CallableMemberDescriptor
abstract val caller: FunctionCaller<*>
@@ -33,35 +32,47 @@ internal abstract class KCallableImpl<out R> : KCallable<R>, KAnnotatedElementIm
abstract val container: KDeclarationContainerImpl
override val annotated: Annotated get() = descriptor
private val annotations_ = ReflectProperties.lazySoft { descriptor.computeAnnotations() }
override val parameters: List<KParameter>
get() {
val descriptor = descriptor
val result = ArrayList<KParameter>()
var index = 0
override val annotations: List<Annotation> get() = annotations_()
if (descriptor.dispatchReceiverParameter != null) {
result.add(KParameterImpl(this, index++, KParameter.Kind.INSTANCE) { descriptor.dispatchReceiverParameter!! })
}
private val parameters_ = ReflectProperties.lazySoft {
val descriptor = descriptor
val result = ArrayList<KParameter>()
var index = 0
if (descriptor.extensionReceiverParameter != null) {
result.add(KParameterImpl(this, index++, KParameter.Kind.EXTENSION_RECEIVER) { descriptor.extensionReceiverParameter!! })
}
for (i in descriptor.valueParameters.indices) {
result.add(KParameterImpl(this, index++, KParameter.Kind.VALUE) { descriptor.valueParameters[i] })
}
result.trimToSize()
return result
if (descriptor.dispatchReceiverParameter != null) {
result.add(KParameterImpl(this, index++, KParameter.Kind.INSTANCE) { descriptor.dispatchReceiverParameter!! })
}
if (descriptor.extensionReceiverParameter != null) {
result.add(KParameterImpl(this, index++, KParameter.Kind.EXTENSION_RECEIVER) { descriptor.extensionReceiverParameter!! })
}
for (i in descriptor.valueParameters.indices) {
result.add(KParameterImpl(this, index++, KParameter.Kind.VALUE) { descriptor.valueParameters[i] })
}
result.trimToSize()
result
}
override val parameters: List<KParameter>
get() = parameters_()
private val returnType_ = ReflectProperties.lazySoft {
KTypeImpl(descriptor.returnType!!) { caller.returnType }
}
override val returnType: KType
get() = KTypeImpl(descriptor.returnType!!) { caller.returnType }
get() = returnType_()
private val typeParameters_ = ReflectProperties.lazySoft {
descriptor.typeParameters.map(::KTypeParameterImpl)
}
override val typeParameters: List<KTypeParameter>
get() = descriptor.typeParameters.map(::KTypeParameterImpl)
get() = typeParameters_()
override val visibility: KVisibility?
get() = descriptor.visibility.toKVisibility()
@@ -134,15 +145,15 @@ internal abstract class KCallableImpl<out R> : KCallable<R>, KAnnotatedElementIm
private fun defaultPrimitiveValue(type: Type): Any? =
if (type is Class<*> && type.isPrimitive) {
when (type) {
java.lang.Boolean.TYPE -> false
java.lang.Character.TYPE -> 0.toChar()
java.lang.Byte.TYPE -> 0.toByte()
java.lang.Short.TYPE -> 0.toShort()
java.lang.Integer.TYPE -> 0
java.lang.Float.TYPE -> 0f
java.lang.Long.TYPE -> 0L
java.lang.Double.TYPE -> 0.0
java.lang.Void.TYPE -> throw IllegalStateException("Parameter with void type is illegal")
Boolean::class.java -> false
Char::class.java -> 0.toChar()
Byte::class.java -> 0.toByte()
Short::class.java -> 0.toShort()
Int::class.java -> 0
Float::class.java -> 0f
Long::class.java -> 0L
Double::class.java -> 0.0
Void.TYPE -> throw IllegalStateException("Parameter with void type is illegal")
else -> throw UnsupportedOperationException("Unknown primitive: $type")
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+4 -4
View File
@@ -18,7 +18,6 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.builtins.CompanionObjectMapping
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.java.structure.reflect.functionClassArity
@@ -35,8 +34,7 @@ import kotlin.reflect.*
import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED
import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.INHERITED
internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
KDeclarationContainerImpl(), KClass<T>, KClassifierImpl, KAnnotatedElementImpl {
internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclarationContainerImpl(), KClass<T>, KClassifierImpl {
inner class Data : KDeclarationContainerImpl.Data() {
val descriptor: ClassDescriptor by ReflectProperties.lazySoft {
val classId = classId
@@ -49,6 +47,8 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
descriptor ?: reportUnresolvedClass()
}
val annotations: List<Annotation> by ReflectProperties.lazySoft { descriptor.computeAnnotations() }
val simpleName: String? by ReflectProperties.lazySoft {
if (jClass.isAnonymousClass) return@lazySoft null
@@ -156,7 +156,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
override val descriptor: ClassDescriptor get() = data().descriptor
override val annotated: Annotated get() = descriptor
override val annotations: List<Annotation> get() = data().annotations
private val classId: ClassId get() = RuntimeTypeMapper.mapJvmClassToKotlinClassId(jClass)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+1 -1
View File
@@ -40,7 +40,7 @@ internal class KFunctionImpl private constructor(
container, descriptor.name.asString(), RuntimeTypeMapper.mapSignature(descriptor).asString(), descriptor
)
override val descriptor: FunctionDescriptor by ReflectProperties.lazySoft<FunctionDescriptor>(descriptorInitialValue) {
override val descriptor: FunctionDescriptor by ReflectProperties.lazySoft(descriptorInitialValue) {
container.findFunctionDescriptor(name, signature)
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KParameterImpl.kt
+2 -3
View File
@@ -18,7 +18,6 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.ParameterDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
import kotlin.reflect.KParameter
import kotlin.reflect.KType
@@ -28,10 +27,10 @@ internal class KParameterImpl(
override val index: Int,
override val kind: KParameter.Kind,
computeDescriptor: () -> ParameterDescriptor
) : KParameter, KAnnotatedElementImpl {
) : KParameter {
private val descriptor: ParameterDescriptor by ReflectProperties.lazySoft(computeDescriptor)
override val annotated: Annotated get() = descriptor
override val annotations: List<Annotation> by ReflectProperties.lazySoft { descriptor.computeAnnotations() }
override val name: String? get() {
val valueParameter = descriptor as? ValueParameterDescriptor ?: return null
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+1 -1
View File
@@ -79,7 +79,7 @@ internal abstract class KPropertyImpl<out R> private constructor(
override abstract val getter: Getter<R>
private val descriptor_ = ReflectProperties.lazySoft<PropertyDescriptor>(descriptorInitialValue) {
private val descriptor_ = ReflectProperties.lazySoft(descriptorInitialValue) {
container.findPropertyDescriptor(name, signature)
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt
+34 -36
View File
@@ -42,8 +42,7 @@ internal class KTypeImpl(
) : KType {
internal val javaType: Type by ReflectProperties.lazySoft(computeJavaType)
override val classifier: KClassifier?
get() = convert(type)
override val classifier: KClassifier? by ReflectProperties.lazySoft { convert(type) }
private fun convert(type: KotlinType): KClassifier? {
val descriptor = type.constructor.declarationDescriptor
@@ -71,47 +70,46 @@ internal class KTypeImpl(
}
}
override val arguments: List<KTypeProjection>
get() {
val typeArguments = type.arguments
if (typeArguments.isEmpty()) return emptyList()
override val arguments: List<KTypeProjection> by ReflectProperties.lazySoft arguments@ {
val typeArguments = type.arguments
if (typeArguments.isEmpty()) return@arguments emptyList<KTypeProjection>()
val parameterizedTypeArguments by lazy(PUBLICATION) { javaType.parameterizedTypeArguments }
val parameterizedTypeArguments by lazy(PUBLICATION) { javaType.parameterizedTypeArguments }
return typeArguments.mapIndexed { i, typeProjection ->
if (typeProjection.isStarProjection) {
KTypeProjection.STAR
}
else {
val type = KTypeImpl(typeProjection.type) {
val javaType = javaType
when (javaType) {
is Class<*> -> {
// It's either an array or a raw type.
// TODO: return upper bound of the corresponding parameter for a raw type?
if (javaType.isArray) javaType.componentType else Any::class.java
}
is GenericArrayType -> {
if (i != 0) throw KotlinReflectionInternalError("Array type has been queried for a non-0th argument: $this")
javaType.genericComponentType
}
is ParameterizedType -> {
val argument = parameterizedTypeArguments[i]
// In "Foo<out Bar>", the JVM type of the first type argument should be "Bar", not "? extends Bar"
if (argument !is WildcardType) argument
else argument.lowerBounds.firstOrNull() ?: argument.upperBounds.first()
}
else -> throw KotlinReflectionInternalError("Non-generic type has been queried for arguments: $this")
typeArguments.mapIndexed { i, typeProjection ->
if (typeProjection.isStarProjection) {
KTypeProjection.STAR
}
else {
val type = KTypeImpl(typeProjection.type) {
val javaType = javaType
when (javaType) {
is Class<*> -> {
// It's either an array or a raw type.
// TODO: return upper bound of the corresponding parameter for a raw type?
if (javaType.isArray) javaType.componentType else Any::class.java
}
is GenericArrayType -> {
if (i != 0) throw KotlinReflectionInternalError("Array type has been queried for a non-0th argument: $this")
javaType.genericComponentType
}
is ParameterizedType -> {
val argument = parameterizedTypeArguments[i]
// In "Foo<out Bar>", the JVM type of the first type argument should be "Bar", not "? extends Bar"
if (argument !is WildcardType) argument
else argument.lowerBounds.firstOrNull() ?: argument.upperBounds.first()
}
else -> throw KotlinReflectionInternalError("Non-generic type has been queried for arguments: $this")
}
when (typeProjection.projectionKind) {
Variance.INVARIANT -> KTypeProjection.invariant(type)
Variance.IN_VARIANCE -> KTypeProjection.contravariant(type)
Variance.OUT_VARIANCE -> KTypeProjection.covariant(type)
}
}
when (typeProjection.projectionKind) {
Variance.INVARIANT -> KTypeProjection.invariant(type)
Variance.IN_VARIANCE -> KTypeProjection.contravariant(type)
Variance.OUT_VARIANCE -> KTypeProjection.covariant(type)
}
}
}
}
override val isMarkedNullable: Boolean
get() = type.isMarkedNullable
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt
+3 -2
View File
@@ -26,12 +26,13 @@ internal class KTypeParameterImpl(override val descriptor: TypeParameterDescript
override val name: String
get() = descriptor.name.asString()
override val upperBounds: List<KType>
get() = descriptor.upperBounds.map { kotlinType ->
override val upperBounds: List<KType> by ReflectProperties.lazySoft {
descriptor.upperBounds.map { kotlinType ->
KTypeImpl(kotlinType) {
TODO("Java type is not yet supported for type parameters: $descriptor")
}
}
}
override val variance: KVariance
get() = when (descriptor.variance) {
core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+13
View File
@@ -19,11 +19,14 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.load.java.components.RuntimeSourceElementFactory
import org.jetbrains.kotlin.load.java.reflect.tryLoadClass
import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaAnnotation
import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaClass
import org.jetbrains.kotlin.load.java.structure.reflect.safeClassLoader
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
import org.jetbrains.kotlin.load.kotlin.reflect.ReflectAnnotationSource
import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
@@ -85,6 +88,16 @@ internal fun Visibility.toKVisibility(): KVisibility? =
else -> null
}
internal fun Annotated.computeAnnotations(): List<Annotation> =
annotations.mapNotNull {
val source = it.source
when (source) {
is ReflectAnnotationSource -> source.annotation
is RuntimeSourceElementFactory.RuntimeSourceElement -> (source.javaElement as? ReflectJavaAnnotation)?.annotation
else -> null
}
}
// TODO: wrap other exceptions
internal inline fun <R> reflectionCall(block: () -> R): R =
try {