From 5dd4843b5a4c760a4d325227f29a79d6ac8edfb6 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 22 Sep 2015 17:48:55 +0300 Subject: [PATCH] reflection.jvm: Drop usages of KotlinBuiltIns.getInstance() --- .../src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index 0a27ac0d39a..e98bce02238 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -190,15 +190,15 @@ internal object RuntimeTypeMapper { } fun mapJvmClassToKotlinClassId(klass: Class<*>): ClassId { - if (klass.isArray()) { - klass.getComponentType().primitiveType?.let { - return KotlinBuiltIns.getInstance().getPrimitiveArrayClassDescriptor(it).classId + if (klass.isArray) { + klass.componentType.primitiveType?.let { + return ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName) } return ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.array.toSafe()) } klass.primitiveType?.let { - return KotlinBuiltIns.getInstance().getPrimitiveClassDescriptor(it).classId + return ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.typeName) } val classId = klass.classId