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

Fix platformStatic in reflection-jvm

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-14 20:10:41 +03:00
parent 4b3999bf6c
commit e0c85cba23
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
-1
View File
@@ -66,7 +66,6 @@ open class KFunctionImpl protected constructor(
is Constructor<*> -> FunctionCaller.Constructor(member) is Constructor<*> -> FunctionCaller.Constructor(member)
is Method -> when { is Method -> when {
!Modifier.isStatic(member.modifiers) -> FunctionCaller.InstanceMethod(member) !Modifier.isStatic(member.modifiers) -> FunctionCaller.InstanceMethod(member)
descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null, descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
descriptor.annotations.findAnnotation(JVM_STATIC) != null -> descriptor.annotations.findAnnotation(JVM_STATIC) != null ->
FunctionCaller.JvmStaticInObject(member) FunctionCaller.JvmStaticInObject(member)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+2 -2
View File
@@ -87,8 +87,8 @@ interface KMutablePropertyImpl<R> : KMutableProperty<R>, KPropertyImpl<R> {
private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> { private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> {
fun isJvmStaticProperty() = fun isJvmStaticProperty() =
property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null || Annotations.Companion.findAnyAnnotation(property.descriptor.annotations, PLATFORM_STATIC) != null ||
property.descriptor.annotations.findAnnotation(JVM_STATIC) != null Annotations.Companion.findAnyAnnotation(property.descriptor.annotations, JVM_STATIC) != null
fun isNotNullProperty() = fun isNotNullProperty() =
!TypeUtils.isNullableType(property.descriptor.type) !TypeUtils.isNullableType(property.descriptor.type)