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

Support KClass.simpleName in stdlib-only reflection implementation

Browse Source 
#KT-33646 Fixed
This commit is contained in:
Alexander Udalov
2019-10-24 18:33:46 +02:00
parent e146d308db
commit c164745301
15 changed files with 138 additions and 77 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
+5 -5
View File
@@ -17,8 +17,8 @@
package org.jetbrains.kotlin.resolve.jvm.checkers
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.NotFoundClasses
import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.resolve.calls.checkers.AbstractReflectionApiCallChecker
@@ -32,10 +32,10 @@ import org.jetbrains.kotlin.storage.getValue
* of reflection API which will fail at runtime.
*/
class JvmReflectionAPICallChecker(
private val module: ModuleDescriptor,
notFoundClasses: NotFoundClasses,
storageManager: StorageManager
) : AbstractReflectionApiCallChecker(module, notFoundClasses, storageManager) {
private val module: ModuleDescriptor,
reflectionTypes: ReflectionTypes,
storageManager: StorageManager
) : AbstractReflectionApiCallChecker(reflectionTypes, storageManager) {
override val isWholeReflectionApiAvailable by storageManager.createLazyValue {
module.findClassAcrossModuleDependencies(JvmAbi.REFLECTION_FACTORY_IMPL) != null
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt
+8 -6
View File
@@ -21,8 +21,7 @@ import org.jetbrains.kotlin.builtins.KOTLIN_REFLECT_FQ_NAME
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.NotFoundClasses
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
@@ -36,18 +35,21 @@ private val ANY_MEMBER_NAMES = setOf("equals", "hashCode", "toString")
* Checks that there are no usages of reflection API which will fail at runtime.
*/
abstract class AbstractReflectionApiCallChecker(
private val module: ModuleDescriptor,
private val notFoundClasses: NotFoundClasses,
private val reflectionTypes: ReflectionTypes,
storageManager: StorageManager
) : CallChecker {
protected abstract val isWholeReflectionApiAvailable: Boolean
protected abstract fun report(element: PsiElement, context: CallCheckerContext)
private val kPropertyClasses by storageManager.createLazyValue {
val reflectionTypes = ReflectionTypes(module, notFoundClasses)
setOf(reflectionTypes.kProperty0, reflectionTypes.kProperty1, reflectionTypes.kProperty2)
}
private val kClass by storageManager.createLazyValue { reflectionTypes.kClass }
protected open fun isAllowedKClassMember(name: Name): Boolean =
name.asString() == "simpleName"
final override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
if (isWholeReflectionApiAvailable) return
@@ -68,6 +70,7 @@ abstract class AbstractReflectionApiCallChecker(
return name.asString() in ANY_MEMBER_NAMES ||
name == OperatorNameConventions.INVOKE ||
name.asString() == "name" ||
DescriptorUtils.isSubclass(containingClass, kClass) && isAllowedKClassMember(descriptor.name) ||
(name.asString() == "get" || name.asString() == "set") && containingClass.isKPropertyClass()
}
@@ -79,4 +82,3 @@ abstract class AbstractReflectionApiCallChecker(
return fqName == KOTLIN_REFLECT_FQ_NAME.toUnsafe() || fqName.asString().startsWith(KOTLIN_REFLECT_FQ_NAME.asString() + ".")
}
}
compiler/testData/codegen/box/reflection/classLiterals/builtinClassLiterals.kt
Vendored
+14 -6
View File
@@ -1,8 +1,5 @@
// IGNORE_BACKEND: JS_IR
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE
// WITH_REFLECT
// TARGET_BACKEND: JVM
// WITH_RUNTIME
import kotlin.test.assertEquals
@@ -16,6 +13,10 @@ fun box(): String {
assertEquals("Array", Array<Any>::class.simpleName)
assertEquals("Array", Array<IntArray>::class.simpleName)
assertEquals("Array", Array<Array<String>>::class.simpleName)
assertEquals("IntArray", IntArray::class.simpleName)
assertEquals("DoubleArray", DoubleArray::class.simpleName)
assertEquals("Companion", Int.Companion::class.simpleName)
assertEquals("Companion", Double.Companion::class.simpleName)
@@ -24,9 +25,16 @@ fun box(): String {
assertEquals("IntRange", IntRange::class.simpleName)
assertEquals("List", List::class.simpleName)
assertEquals("Entry", Map.Entry::class.simpleName)
// TODO: this is wrong but should be fixed
// TODO: KT-11754
assertEquals("List", MutableList::class.simpleName)
assertEquals("Entry", MutableMap.MutableEntry::class.simpleName)
assertEquals("Function0", Function0::class.simpleName)
assertEquals("Function1", Function1::class.simpleName)
assertEquals("Function5", Function5::class.simpleName)
assertEquals("FunctionN", Function42::class.simpleName)
return "OK"
}
compiler/testData/codegen/box/reflection/classes/classSimpleName.kt
Vendored
+1 -3
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
// WITH_RUNTIME
import kotlin.test.assertEquals
@@ -10,7 +9,6 @@ fun box(): String {
assertEquals("Klass", Klass::class.simpleName)
assertEquals("Date", java.util.Date::class.simpleName)
assertEquals("ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.simpleName)
assertEquals("Void", java.lang.Void::class.simpleName)
return "OK"
}
compiler/testData/codegen/box/reflection/classes/javaVoid.kt
Vendored
+2
View File
@@ -13,5 +13,7 @@ fun box(): String {
assertEquals(Void.TYPE, Void.TYPE.kotlin.javaPrimitiveType)
assertEquals(Void::class.java, Void.TYPE.kotlin.javaObjectType)
assertEquals("Void", Void::class.simpleName)
return "OK"
}
compiler/testData/codegen/box/reflection/classes/localClassSimpleName.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: NATIVE
// WITH_REFLECT
// WITH_RUNTIME
import kotlin.reflect.KClass
import kotlin.test.assertEquals
compiler/testData/codegen/box/reflection/noReflectAtRuntime/javaClass.kt
Vendored
+4 -3
View File
@@ -15,11 +15,11 @@ fun box(): String {
assertEquals("Klass", jClass.getSimpleName())
assertEquals("Klass", kjClass.getSimpleName())
assertEquals("Klass", kkClass.java.simpleName)
assertEquals("Klass", kClass.simpleName)
assertEquals(kjClass, jjClass)
try { kClass.simpleName; return "Fail 1" } catch (e: Error) {}
try { kClass.qualifiedName; return "Fail 2" } catch (e: Error) {}
try { kClass.members; return "Fail 3" } catch (e: Error) {}
try { kClass.qualifiedName; return "Fail qualifiedName" } catch (e: Error) {}
try { kClass.members; return "Fail members" } catch (e: Error) {}
val jlError = Error::class.java
val kljError = Error::class
@@ -29,6 +29,7 @@ fun box(): String {
assertEquals("Error", jlError.getSimpleName())
assertEquals("Error", jljError.getSimpleName())
assertEquals("Error", jlkError.java.simpleName)
assertEquals("Error", kljError.simpleName)
return "OK"
}
compiler/testData/codegen/box/reflection/noReflectAtRuntime/javaVoid.kt
Vendored
+2
View File
@@ -13,5 +13,7 @@ fun box(): String {
assertEquals(Void.TYPE, Void.TYPE.kotlin.javaPrimitiveType)
assertEquals(Void::class.java, Void.TYPE.kotlin.javaObjectType)
assertEquals("Void", Void::class.simpleName)
return "OK"
}
compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.kt
Vendored
+2 -2
View File
@@ -17,11 +17,11 @@ fun n11() = (Foo::func)(Foo(""))
fun y01() = Foo::prop.<!NO_REFLECTION_IN_CLASS_PATH!>getter<!>
fun y02() = Foo::class.<!NO_REFLECTION_IN_CLASS_PATH!>members<!>
fun y03() = Foo::class.<!NO_REFLECTION_IN_CLASS_PATH!>simpleName<!>
fun y03() = Foo::class.simpleName
fun y04() = Foo::class.<!UNRESOLVED_REFERENCE!>properties<!>
fun <T : Any> kclass(k: KClass<*>, kt: KClass<T>) {
k.<!NO_REFLECTION_IN_CLASS_PATH!>simpleName<!>
k.simpleName
k.<!NO_REFLECTION_IN_CLASS_PATH!>qualifiedName<!>
k.<!NO_REFLECTION_IN_CLASS_PATH!>members<!>
k.<!NO_REFLECTION_IN_CLASS_PATH!>constructors<!>