diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt index f6fc17f70af..271fe350d7f 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt @@ -919,7 +919,9 @@ abstract class IrFileDeserializer(val logger: LoggingContext, val builtIns: IrBu } private fun eraseDelegatedSymbol(symbol: IrSymbol) { - delegatedSymbolMap.remove(symbol) + if (symbol is IrDelegatingSymbol<*, *, *>) { + delegatedSymbolMap.remove(symbol) + } } private inline fun T.usingParent(block: T.() -> Unit): T = diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt index 57e478bb1eb..d5dd390c55a 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt @@ -1233,7 +1233,7 @@ open class IrFileSerializer( // TODO: keep order similar val sigIndex = protoIdSignatureMap[idSig] ?: error("Not found ID for $idSig (${it.render()})") - topLevelDeclarations.add(TopLevelDeclaration(sigIndex, it.descriptor.toString(), byteArray)) + topLevelDeclarations.add(TopLevelDeclaration(sigIndex, idSig.toString(), byteArray)) proto.addDeclarationId(sigIndex) }