From 2e966a7ded0b00e35475e15cab1e77743fec187d Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 16 Apr 2019 21:41:26 +0300 Subject: [PATCH] FIR deserializer: load type-parameters for kotlin function properly --- .../kotlin/fir/deserialization/FirMemberDeserializer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index 142e12fc02a..f6010df92e1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirNamedFunction import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.* import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.resolve.transformers.firUnsafe import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -153,7 +154,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { proto.receiverType(c.typeTable)?.let(local.typeDeserializer::type)?.toTypeRef(), local.typeDeserializer.type(proto.returnType(c.typeTable)).toTypeRef() ).apply { - typeParameters += local.typeDeserializer.ownTypeParameters.map { createTypeParameterSymbol(it.name).fir } + typeParameters += local.typeDeserializer.ownTypeParameters.map { it.firUnsafe() } valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList) annotations += getAnnotations(proto, flags, AnnotatedCallableKind.FUNCTION) }