reflection.jvm: Drop usages of KotlinBuiltIns.getInstance()

This commit is contained in:
Pavel V. Talanov
2015-09-22 17:48:55 +03:00
parent 537134613a
commit 5dd4843b5a
@@ -190,15 +190,15 @@ internal object RuntimeTypeMapper {
} }
fun mapJvmClassToKotlinClassId(klass: Class<*>): ClassId { fun mapJvmClassToKotlinClassId(klass: Class<*>): ClassId {
if (klass.isArray()) { if (klass.isArray) {
klass.getComponentType().primitiveType?.let { klass.componentType.primitiveType?.let {
return KotlinBuiltIns.getInstance().getPrimitiveArrayClassDescriptor(it).classId return ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName)
} }
return ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.array.toSafe()) return ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.array.toSafe())
} }
klass.primitiveType?.let { klass.primitiveType?.let {
return KotlinBuiltIns.getInstance().getPrimitiveClassDescriptor(it).classId return ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.typeName)
} }
val classId = klass.classId val classId = klass.classId