From e7a67c7a16de884c0ff36ddef536ef9fff70d438 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 14 May 2020 18:58:13 +0300 Subject: [PATCH] FIR: Extract StandardClassIds.KClass --- .../src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt | 3 ++- .../body/resolve/FirExpressionsResolveTransformer.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt index a9950bdfdb1..a0acab10fc5 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt @@ -49,6 +49,7 @@ object StandardClassIds { val KProperty2 = "KProperty2".reflectId() val KMutableProperty2 = "KMutableProperty2".reflectId() val KFunction = "KFunction".reflectId() + val KClass = "KClass".reflectId() val Comparable = "Comparable".baseId() val Number = "Number".baseId() @@ -73,4 +74,4 @@ object StandardClassIds { val elementTypeByUnsignedArrayType = unsignedArrayTypeByElementType.inverseMap() } -private fun Map.inverseMap() = entries.associate { (k, v) -> v to k } \ No newline at end of file +private fun Map.inverseMap() = entries.associate { (k, v) -> v to k } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt index b057f06750a..72138cb01fa 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt @@ -520,7 +520,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : transformedGetClassCall.resultType = buildResolvedTypeRef { - type = ClassId.fromString("kotlin/reflect/KClass").constructClassLikeType(arrayOf(typeOfExpression), false) + type = StandardClassIds.KClass.constructClassLikeType(arrayOf(typeOfExpression), false) } return transformedGetClassCall.compose() }