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

Support inline classes in function signatures in call/callBy

Browse Source 
#KT-25664 Fixed
 #KT-26748 Open
 #KT-26765 Open
This commit is contained in:
Alexander Udalov
2018-08-28 19:09:19 +02:00
parent 3e79bd2b0e
commit 3a5de13dd4
17 changed files with 666 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+2 -2
View File
@@ -87,7 +87,7 @@ internal class KFunctionImpl private constructor(
createStaticMethodCaller(member)
}
else -> throw KotlinReflectionInternalError("Could not compute caller for function: $descriptor (member = $member)")
}
}.createInlineClassAwareCallerIfNeeded(descriptor)
}
override val defaultCaller: Caller<*>? by ReflectProperties.lazySoft defaultCaller@{
@@ -129,7 +129,7 @@ internal class KFunctionImpl private constructor(
createStaticMethodCaller(member)
}
else -> null
}
}?.createInlineClassAwareCallerIfNeeded(descriptor, isDefault = true)
}
private fun createStaticMethodCaller(member: Method) =
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+3 -2
View File
@@ -24,6 +24,7 @@ import kotlin.reflect.jvm.internal.JvmPropertySignature.*
import kotlin.reflect.jvm.internal.calls.Caller
import kotlin.reflect.jvm.internal.calls.CallerImpl
import kotlin.reflect.jvm.internal.calls.ThrowingCaller
import kotlin.reflect.jvm.internal.calls.createInlineClassAwareCallerIfNeeded
internal abstract class KPropertyImpl<out R> private constructor(
override val container: KDeclarationContainerImpl,
@@ -185,7 +186,7 @@ private fun KPropertyImpl.Accessor<*, *>.computeCallerForAccessor(isGetter: Bool
fun isNotNullProperty(): Boolean =
!TypeUtils.isNullableType(property.descriptor.type)
fun computeFieldCaller(field: Field): Caller<Field> = when {
fun computeFieldCaller(field: Field): CallerImpl<Field> = when {
property.descriptor.isJvmFieldPropertyInCompanionObject() || !Modifier.isStatic(field.modifiers) ->
if (isGetter)
if (isBound) CallerImpl.FieldGetter.BoundInstance(field, property.boundReceiver)
@@ -263,7 +264,7 @@ private fun KPropertyImpl.Accessor<*, *>.computeCallerForAccessor(isGetter: Bool
return if (isBound) CallerImpl.Method.BoundInstance(accessor, property.boundReceiver)
else CallerImpl.Method.Instance(accessor)
}
}
}.createInlineClassAwareCallerIfNeeded(descriptor)
}
private fun PropertyDescriptor.isJvmFieldPropertyInCompanionObject(): Boolean {
core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/Caller.kt
+5
View File
@@ -26,3 +26,8 @@ internal interface Caller<out M : Member?> {
internal val Caller<*>.arity: Int
get() = parameterTypes.size
/**
* A marker interface that signifies that this caller has a "bound receiver" object which should be used as the dispatch receiver instance.
*/
interface BoundCaller
core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/CallerImpl.kt
+11 -8
View File
@@ -44,7 +44,7 @@ internal sealed class CallerImpl<out M : Member>(
// TODO fix 'callBy' for bound (and non-bound) inner class constructor references
// See https://youtrack.jetbrains.com/issue/KT-14990
class BoundConstructor(constructor: ReflectConstructor<*>, private val boundReceiver: Any?) :
class BoundConstructor(constructor: ReflectConstructor<*>, private val boundReceiver: Any?) : BoundCaller,
CallerImpl<ReflectConstructor<*>>(
constructor, constructor.declaringClass, null,
constructor.genericParameterTypes
@@ -96,7 +96,7 @@ internal sealed class CallerImpl<out M : Member>(
}
}
class BoundStatic(method: ReflectMethod, private val boundReceiver: Any?) : Method(
class BoundStatic(method: ReflectMethod, private val boundReceiver: Any?) : BoundCaller, Method(
method, requiresInstance = false, parameterTypes = method.genericParameterTypes.dropFirst()
) {
override fun call(args: Array<*>): Any? {
@@ -105,14 +105,15 @@ internal sealed class CallerImpl<out M : Member>(
}
}
class BoundInstance(method: ReflectMethod, private val boundReceiver: Any?) : Method(method, requiresInstance = false) {
class BoundInstance(method: ReflectMethod, private val boundReceiver: Any?) : BoundCaller,
Method(method, requiresInstance = false) {
override fun call(args: Array<*>): Any? {
checkArguments(args)
return callMethod(boundReceiver, args)
}
}
class BoundJvmStaticInObject(method: ReflectMethod) : Method(method, requiresInstance = false) {
class BoundJvmStaticInObject(method: ReflectMethod) : BoundCaller, Method(method, requiresInstance = false) {
override fun call(args: Array<*>): Any? {
checkArguments(args)
return callMethod(null, args)
@@ -145,14 +146,15 @@ internal sealed class CallerImpl<out M : Member>(
}
}
class BoundInstance(field: ReflectField, private val boundReceiver: Any?) : FieldGetter(field, requiresInstance = false) {
class BoundInstance(field: ReflectField, private val boundReceiver: Any?) : BoundCaller,
FieldGetter(field, requiresInstance = false) {
override fun call(args: Array<*>): Any? {
checkArguments(args)
return member.get(boundReceiver)
}
}
class BoundJvmStaticInObject(field: ReflectField) : FieldGetter(field, requiresInstance = false)
class BoundJvmStaticInObject(field: ReflectField) : BoundCaller, FieldGetter(field, requiresInstance = false)
}
sealed class FieldSetter(
@@ -188,7 +190,7 @@ internal sealed class CallerImpl<out M : Member>(
}
}
class BoundInstance(field: ReflectField, notNull: Boolean, private val boundReceiver: Any?) :
class BoundInstance(field: ReflectField, notNull: Boolean, private val boundReceiver: Any?) : BoundCaller,
FieldSetter(field, notNull, requiresInstance = false) {
override fun call(args: Array<*>): Any? {
checkArguments(args)
@@ -196,7 +198,8 @@ internal sealed class CallerImpl<out M : Member>(
}
}
class BoundJvmStaticInObject(field: ReflectField, notNull: Boolean) : FieldSetter(field, notNull, requiresInstance = false) {
class BoundJvmStaticInObject(field: ReflectField, notNull: Boolean) : BoundCaller,
FieldSetter(field, notNull, requiresInstance = false) {
override fun call(args: Array<*>): Any? {
checkArguments(args)
return member.set(null, args.last())
core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt
+138
View File
@@ -0,0 +1,138 @@
/*
* 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.calls
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.resolve.descriptorUtil.classId
import org.jetbrains.kotlin.resolve.isInlineClassType
import org.jetbrains.kotlin.types.KotlinType
import java.lang.reflect.Member
import java.lang.reflect.Method
import java.lang.reflect.Type
import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
import kotlin.reflect.jvm.internal.toJavaClass
/**
* A caller that is used whenever the declaration has inline classes in its parameter types or return type.
* Each argument of an inline class type is unboxed, and the return value (if it's of an inline class type) is boxed.
*/
internal class InlineClassAwareCaller<out M : Member>(
private val descriptor: CallableMemberDescriptor,
private val caller: CallerImpl<M>,
private val isDefault: Boolean
) : Caller<M> {
override val member: M
get() = caller.member
override val returnType: Type
get() = caller.returnType
override val parameterTypes: List<Type>
get() = caller.parameterTypes
private class BoxUnboxData(val argumentRange: IntRange, val unbox: Array<Method?>, val box: Method?) {
operator fun component1(): IntRange = argumentRange
operator fun component2(): Array<Method?> = unbox
operator fun component3(): Method? = box
}
private val data: BoxUnboxData by lazy(LazyThreadSafetyMode.PUBLICATION) {
val shift = when {
caller is CallerImpl.Method.BoundStatic -> {
// Bound reference to a static method is only possible for a top level extension function/property,
// and in that case the number of expected arguments is one less than usual, hence -1
-1
}
descriptor.dispatchReceiverParameter != null && caller !is BoundCaller -> 1
else -> 0
}
val extraArgumentsTail = if (isDefault) 2 else 0
val kotlinParameterTypes =
listOfNotNull(descriptor.extensionReceiverParameter?.type) +
descriptor.valueParameters.map(ValueParameterDescriptor::getType)
val expectedArgsSize = kotlinParameterTypes.size + shift + extraArgumentsTail
if (arity != expectedArgsSize) {
throw KotlinReflectionInternalError(
"Inconsistent number of parameters in the descriptor and Java reflection object: $arity != $expectedArgsSize\n" +
"Calling: $descriptor\n" +
"Parameter types: ${this.parameterTypes})\n" +
"Default: $isDefault"
)
}
// maxOf is needed because in case of a bound top level extension, shift can be -1 (see above). But in that case, we need not unbox
// the extension receiver argument, since it has already been unboxed at compile time and generated into the reference
val argumentRange = maxOf(shift, 0) until (kotlinParameterTypes.size + shift)
val unbox = Array(expectedArgsSize) { i ->
if (i in argumentRange) {
kotlinParameterTypes[i - shift].toInlineClass()?.getUnboxMethod()
} else null
}
val box = descriptor.returnType!!.toInlineClass()?.getBoxMethod()
BoxUnboxData(argumentRange, unbox, box)
}
override fun call(args: Array<*>): Any? {
val (range, unbox, box) = data
@Suppress("UNCHECKED_CAST")
val unboxed = args.copyOf() as Array<Any?>
for (index in range) {
val method = unbox[index]
val arg = args[index]
// Note that arg may be null in case we're calling a $default method and it's an optional parameter of an inline class type
unboxed[index] =
if (method != null && arg != null) method.invoke(arg)
else arg
}
val result = caller.call(unboxed)
return box?.invoke(null, result) ?: result
}
private fun Class<*>.getBoxMethod(): Method = try {
getDeclaredMethod("box" + JvmAbi.IMPL_SUFFIX_FOR_INLINE_CLASS_MEMBERS, getUnboxMethod().returnType)
} catch (e: NoSuchMethodException) {
throw KotlinReflectionInternalError("No box method found in inline class: $this (calling $descriptor)")
}
private fun Class<*>.getUnboxMethod(): Method = try {
getDeclaredMethod("unbox" + JvmAbi.IMPL_SUFFIX_FOR_INLINE_CLASS_MEMBERS)
} catch (e: NoSuchMethodException) {
throw KotlinReflectionInternalError("No unbox method found in inline class: $this (calling $descriptor)")
}
private fun KotlinType.toInlineClass(): Class<*>? {
val descriptor = constructor.declarationDescriptor
if (descriptor is ClassDescriptor && descriptor.isInline) {
return descriptor.toJavaClass() ?: throw KotlinReflectionInternalError(
"Class object for the class ${descriptor.name} cannot be found (classId=${descriptor.classId})"
)
}
return null
}
}
internal fun <M : Member> CallerImpl<M>.createInlineClassAwareCallerIfNeeded(
descriptor: CallableMemberDescriptor,
isDefault: Boolean = false
): Caller<M> {
val needsInlineAwareCaller =
descriptor.valueParameters.any { it.type.isInlineClassType() } ||
descriptor.returnType?.isInlineClassType() == true ||
(this !is BoundCaller && descriptor.extensionReceiverParameter?.type?.isInlineClassType() == true)
return if (needsInlineAwareCaller) InlineClassAwareCaller(descriptor, this, isDefault) else this
}