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

FIR deserializer: load type-parameters for kotlin function properly

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-16 21:41:26 +03:00
committed by Mikhail Glukhikh
parent 9bbf5bebd2
commit 2e966a7ded
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirNamedFunction
import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.declarations.impl.* import org.jetbrains.kotlin.fir.declarations.impl.*
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall 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.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol 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(), proto.receiverType(c.typeTable)?.let(local.typeDeserializer::type)?.toTypeRef(),
local.typeDeserializer.type(proto.returnType(c.typeTable)).toTypeRef() local.typeDeserializer.type(proto.returnType(c.typeTable)).toTypeRef()
).apply { ).apply {
typeParameters += local.typeDeserializer.ownTypeParameters.map { createTypeParameterSymbol(it.name).fir } typeParameters += local.typeDeserializer.ownTypeParameters.map { it.firUnsafe() }
valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList) valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList)
annotations += getAnnotations(proto, flags, AnnotatedCallableKind.FUNCTION) annotations += getAnnotations(proto, flags, AnnotatedCallableKind.FUNCTION)
} }