rename platformStatic to jvmStatic

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt

@@ -66,7 +66,11 @@ open class KFunctionImpl protected constructor(
             is Constructor<*> -> FunctionCaller.Constructor(member)
             is Method -> when {
                 !Modifier.isStatic(member.modifiers) -> FunctionCaller.InstanceMethod(member)
-                descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null -> FunctionCaller.PlatformStaticInObject(member)
+
+                descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
+                descriptor.annotations.findAnnotation(JVM_STATIC) != null->
+                    FunctionCaller.PlatformStaticInObject(member)
+
                 else -> FunctionCaller.StaticMethod(member)
             }
             else -> throw KotlinReflectionInternalError("Call is not yet supported for this function: $descriptor")

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt

@@ -80,7 +80,8 @@ interface KMutablePropertyImpl<R> : KMutableProperty<R>, KPropertyImpl<R> {
 
 private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> {
     fun isPlatformStaticProperty() =
-            property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null
+            property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null ||
+            property.descriptor.annotations.findAnnotation(JVM_STATIC) != null
 
     fun isNotNullProperty() =
             !TypeUtils.isNullableType(property.descriptor.type)

core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.name.FqName
 import kotlin.reflect.IllegalCallableAccessException
 
 internal val PLATFORM_STATIC = FqName("kotlin.platform.platformStatic")
+internal val JVM_STATIC = FqName("kotlin.jvm.jvmStatic")
 
 // TODO: wrap other exceptions
 internal inline fun <R> reflectionCall(block: () -> R): R =