diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt index ceda071e123..7af94c3065a 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt @@ -260,8 +260,17 @@ class IrDeclarationDeserializer( } else { val symbolData = BinarySymbolData.decode(proto.base.symbol) sig = symbolDeserializer.deserializeIdSignature(symbolData.signatureId) - declareScopedTypeParameter(sig, { - if (it.isPubliclyVisible) IrTypeParameterPublicSymbolImpl(it) else IrTypeParameterSymbolImpl() }, factory) + declareScopedTypeParameter( + sig, + { + if (it.isPubliclyVisible) + symbolDeserializer.deserializeIrSymbol( + sig, BinarySymbolData.SymbolKind.TYPE_PARAMETER_SYMBOL + ) as IrTypeParameterSymbol + else IrTypeParameterSymbolImpl() + }, + factory + ) } } diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/deserializeLazyDeclarations.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/deserializeLazyDeclarations.kt index d5a698bb3d6..e2f7a07b6ce 100644 --- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/deserializeLazyDeclarations.kt +++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/deserializeLazyDeclarations.kt @@ -69,7 +69,7 @@ fun deserializeFromByteArray( fileSymbol = dummyIrFile.symbol, /* TODO */ actuals = emptyList(), enqueueLocalTopLevelDeclaration = {}, // just link to it in symbolTable - handleExpectActualMapping = { _, _ -> TODO() } + handleExpectActualMapping = { _, symbol -> symbol } no expect declarations ) { idSignature, symbolKind -> referencePublicSymbol(symbolTable, descriptorFinder, idSignature, symbolKind) }