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

Support KClass.qualifiedName in stdlib-only reflection implementation

Browse Source 
#KT-34586 Fixed
This commit is contained in:
Alexander Udalov
2019-10-24 19:16:57 +02:00
parent c164745301
commit 5c89f2fa54
10 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmReflectionAPICallChecker.kt
+4
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.calls.checkers.AbstractReflectionApiCallChecker
import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.NO_REFLECTION_IN_CLASS_PATH
@@ -36,6 +37,9 @@ class JvmReflectionAPICallChecker(
reflectionTypes: ReflectionTypes,
storageManager: StorageManager
) : AbstractReflectionApiCallChecker(reflectionTypes, storageManager) {
override fun isAllowedKClassMember(name: Name): Boolean =
super.isAllowedKClassMember(name) || name.asString() == "qualifiedName"
override val isWholeReflectionApiAvailable by storageManager.createLazyValue {
module.findClassAcrossModuleDependencies(JvmAbi.REFLECTION_FACTORY_IMPL) != null
}
compiler/testData/codegen/box/reflection/classes/javaVoid.kt
Vendored
+1
View File
@@ -14,6 +14,7 @@ fun box(): String {
assertEquals(Void::class.java, Void.TYPE.kotlin.javaObjectType)
assertEquals("Void", Void::class.simpleName)
assertEquals("java.lang.Void", Void::class.qualifiedName)
return "OK"
}
compiler/testData/codegen/box/reflection/classes/qualifiedName.kt
Vendored
+6 -2
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
// WITH_RUNTIME
package test
@@ -8,14 +7,19 @@ import kotlin.test.assertEquals
class Klass {
class Nested
class `Nested$With$Dollars`
companion object
}
fun box(): String {
assertEquals("test.Klass", Klass::class.qualifiedName)
assertEquals("test.Klass.Nested", Klass.Nested::class.qualifiedName)
assertEquals("test.Klass.Nested\$With\$Dollars", Klass.`Nested$With$Dollars`::class.qualifiedName)
assertEquals("test.Klass.Companion", Klass.Companion::class.qualifiedName)
assertEquals("java.util.Date", java.util.Date::class.qualifiedName)
assertEquals("kotlin.jvm.internal.Ref.ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.qualifiedName)
class Local
assertEquals(null, Local::class.qualifiedName)
compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt
Vendored
+26 -11
View File
@@ -1,25 +1,40 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
// WITH_RUNTIME
import kotlin.test.assertEquals
fun box(): String {
assertEquals("kotlin.Any", Any::class.qualifiedName)
assertEquals("kotlin.Int", Int::class.qualifiedName)
assertEquals("kotlin.Int.Companion", Int.Companion::class.qualifiedName)
assertEquals("kotlin.IntArray", IntArray::class.qualifiedName)
assertEquals("kotlin.collections.List", List::class.qualifiedName)
assertEquals("kotlin.String", String::class.qualifiedName)
assertEquals("kotlin.String", java.lang.String::class.qualifiedName)
assertEquals("kotlin.CharSequence", CharSequence::class.qualifiedName)
assertEquals("kotlin.Number", Number::class.qualifiedName)
assertEquals("kotlin.Int", Int::class.qualifiedName)
assertEquals("kotlin.Long", Long::class.qualifiedName)
assertEquals("kotlin.Array", Array<Any>::class.qualifiedName)
assertEquals("kotlin.Array", Array<Int>::class.qualifiedName)
assertEquals("kotlin.Array", Array<IntArray>::class.qualifiedName)
assertEquals("kotlin.Array", Array<Array<String>>::class.qualifiedName)
assertEquals("java.util.Date", java.util.Date::class.qualifiedName)
assertEquals("kotlin.jvm.internal.Ref.ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.qualifiedName)
assertEquals("java.lang.Void", java.lang.Void::class.qualifiedName)
assertEquals("kotlin.IntArray", IntArray::class.qualifiedName)
assertEquals("kotlin.DoubleArray", DoubleArray::class.qualifiedName)
assertEquals("kotlin.Int.Companion", Int.Companion::class.qualifiedName)
assertEquals("kotlin.Double.Companion", Double.Companion::class.qualifiedName)
assertEquals("kotlin.Char.Companion", Char.Companion::class.qualifiedName)
assertEquals("kotlin.ranges.IntRange", IntRange::class.qualifiedName)
assertEquals("kotlin.collections.List", List::class.qualifiedName)
assertEquals("kotlin.collections.Map.Entry", Map.Entry::class.qualifiedName)
// TODO: KT-11754
assertEquals("kotlin.collections.List", MutableList::class.qualifiedName)
assertEquals("kotlin.collections.Map.Entry", MutableMap.MutableEntry::class.qualifiedName)
assertEquals("kotlin.Function0", Function0::class.qualifiedName)
assertEquals("kotlin.Function1", Function1::class.qualifiedName)
assertEquals("kotlin.Function5", Function5::class.qualifiedName)
assertEquals("kotlin.jvm.functions.FunctionN", Function42::class.qualifiedName)
return "OK"
}
compiler/testData/codegen/box/reflection/noReflectAtRuntime/javaClass.kt
Vendored
-1
View File
@@ -18,7 +18,6 @@ fun box(): String {
assertEquals("Klass", kClass.simpleName)
assertEquals(kjClass, jjClass)
try { kClass.qualifiedName; return "Fail qualifiedName" } catch (e: Error) {}
try { kClass.members; return "Fail members" } catch (e: Error) {}
val jlError = Error::class.java
compiler/testData/codegen/box/reflection/noReflectAtRuntime/javaVoid.kt
Vendored
+1
View File
@@ -14,6 +14,7 @@ fun box(): String {
assertEquals(Void::class.java, Void.TYPE.kotlin.javaObjectType)
assertEquals("Void", Void::class.simpleName)
assertEquals("java.lang.Void", Void::class.qualifiedName)
return "OK"
}
compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ fun y04() = Foo::class.<!UNRESOLVED_REFERENCE!>properties<!>
fun <T : Any> kclass(k: KClass<*>, kt: KClass<T>) {
k.simpleName
k.<!NO_REFLECTION_IN_CLASS_PATH!>qualifiedName<!>
k.qualifiedName
k.<!NO_REFLECTION_IN_CLASS_PATH!>members<!>
k.<!NO_REFLECTION_IN_CLASS_PATH!>constructors<!>
k.<!NO_REFLECTION_IN_CLASS_PATH!>nestedClasses<!>
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+4 -11
View File
@@ -56,16 +56,6 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
val annotations: List<Annotation> by ReflectProperties.lazySoft { descriptor.computeAnnotations() }
val qualifiedName: String? by ReflectProperties.lazySoft {
if (jClass.isAnonymousClass) return@lazySoft null
val classId = classId
when {
classId.isLocal -> null
else -> classId.asSingleFqName().asString()
}
}
@Suppress("UNCHECKED_CAST")
val constructors: Collection<KFunction<T>> by ReflectProperties.lazySoft {
constructorDescriptors.map { descriptor ->
@@ -163,6 +153,9 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
private val classId: ClassId
get() = RuntimeTypeMapper.mapJvmClassToKotlinClassId(jClass).also { result ->
if (!jClass.isAnonymousClass && !jClass.isLocalClass) {
assert(result.asSingleFqName().asString() == qualifiedName) {
"Incorrect class name computed for class ${jClass.name}. Result: $result. Expected qualified name $qualifiedName"
}
assert(result.shortClassName.asString() == simpleName) {
"Incorrect class name computed for class ${jClass.name}. Result: $result. Expected simple name $simpleName"
}
@@ -217,7 +210,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
override val simpleName: String? get() = ClassReference.getClassSimpleName(jClass)
override val qualifiedName: String? get() = data().qualifiedName
override val qualifiedName: String? get() = ClassReference.getClassQualifiedName(jClass)
override val constructors: Collection<KFunction<T>> get() = data().constructors
libraries/stdlib/jvm/runtime/kotlin/jvm/internal/ClassReference.kt
+17 -1
View File
@@ -12,7 +12,7 @@ public class ClassReference(override val jClass: Class<*>) : KClass<Any>, ClassB
get() = getClassSimpleName(jClass)
override val qualifiedName: String?
get() = error()
get() = getClassQualifiedName(jClass)
override val members: Collection<KCallable<*>>
get() = error()
@@ -137,6 +137,9 @@ public class ClassReference(override val jClass: Class<*>) : KClass<Any>, ClassB
primitiveFqNames.values.associateTo(this) { kotlinName ->
"kotlin.jvm.internal.${kotlinName.substringAfterLast('.')}CompanionObject" to "$kotlinName.Companion"
}
for (arity in 0 until 23) {
put("kotlin.jvm.functions.Function$arity", "kotlin.Function$arity")
}
}
private val simpleNames = classFqNames.mapValues { (_, fqName) -> fqName.substringAfterLast('.') }
@@ -158,5 +161,18 @@ public class ClassReference(override val jClass: Class<*>) : KClass<Any>, ClassB
}
else -> simpleNames[jClass.name] ?: jClass.simpleName
}
public fun getClassQualifiedName(jClass: Class<*>): String? = when {
jClass.isAnonymousClass -> null
jClass.isLocalClass -> null
jClass.isArray -> {
val componentType = jClass.componentType
when {
componentType.isPrimitive -> classFqNames[componentType.name]?.plus("Array")
else -> null
} ?: "kotlin.Array"
}
else -> classFqNames[jClass.name] ?: jClass.canonicalName
}
}
}
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+1
View File
@@ -3297,6 +3297,7 @@ public final class kotlin/jvm/internal/ClassReference : kotlin/jvm/internal/Clas
}
public final class kotlin/jvm/internal/ClassReference$Companion {
public final fun getClassQualifiedName (Ljava/lang/Class;)Ljava/lang/String;
public final fun getClassSimpleName (Ljava/lang/Class;)Ljava/lang/String;
}