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

Move built-in companion intrinsics to core to reuse in reflection

Browse Source
This commit is contained in:
Alexander Udalov
2015-03-31 13:39:38 +03:00
parent ce51327509
commit 7e86d87133
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
+7 -3
View File
@@ -17,6 +17,7 @@
package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.jvm.IntrinsicObjects
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.load.java.structure.reflect.classId
@@ -30,11 +31,12 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeUtils
import kotlin.reflect.KotlinReflectionInternalError
object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
private val kotlinFqNameToJvmDesc = linkedMapOf<FqName, String>()
private val kotlinFqNameToJvmDescNullable = linkedMapOf<FqName, String>()
private val jvmDescToKotlinClassId = linkedMapOf<String, ClassId>();
private val jvmDescToKotlinClassId = linkedMapOf<String, ClassId>()
init {
init()
@@ -61,8 +63,9 @@ object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
val companionObject = kotlinDescriptor.getCompanionObjectDescriptor()
if (companionObject != null) {
// TODO: see org.jetbrains.kotlin.codegen.intrinsics.IntrinsicObjects, extract that logic to core/
recordMapping(companionObject, "Lkotlin/jvm/internal/${kotlinDescriptor.getName().asString()}CompanionObject;")
val runtimeCompanionFqName = IntrinsicObjects.mapType(companionObject)
?: throw KotlinReflectionInternalError("Failed to map intrinsic companion of $kotlinDescriptor")
recordMapping(companionObject, ClassId.topLevel(runtimeCompanionFqName).desc)
}
}
@@ -72,6 +75,7 @@ object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
}
override fun register(javaClass: Class<*>, kotlinDescriptor: ClassDescriptor, direction: JavaToKotlinClassMapBuilder.Direction) {
// TODO: use direction correctly
recordMapping(kotlinDescriptor, javaClass.classId.desc)
}