diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrBodyDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrBodyDeserializer.kt index 5cb236d37e9..eab40901871 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrBodyDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrBodyDeserializer.kt @@ -458,7 +458,7 @@ class IrBodyDeserializer( } private fun deserializeGetValue(proto: ProtoGetValue, start: Int, end: Int, type: IrType): IrGetValue { - val symbol = declarationDeserializer.deserializeIrSymbolAndRemap(proto.symbol) as IrValueSymbol + val symbol = declarationDeserializer.deserializeIrSymbol(proto.symbol) as IrValueSymbol val origin = if (proto.hasOriginName()) deserializeIrStatementOrigin(proto.originName) else null // TODO: origin! return IrGetValueImpl(start, end, type, symbol, origin) @@ -569,7 +569,7 @@ class IrBodyDeserializer( } private fun deserializeSetValue(proto: ProtoSetValue, start: Int, end: Int): IrSetValue { - val symbol = declarationDeserializer.deserializeIrSymbolAndRemap(proto.symbol) as IrValueSymbol + val symbol = declarationDeserializer.deserializeIrSymbol(proto.symbol) as IrValueSymbol val value = deserializeExpression(proto.value) val origin = if (proto.hasOriginName()) deserializeIrStatementOrigin(proto.originName) else null return IrSetValueImpl(start, end, builtIns.unitType, symbol, value, origin) 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 fd2aed49a78..92ad53721cd 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 @@ -189,6 +189,10 @@ class IrDeclarationDeserializer( // Delegating symbol maps to it's delegate only inside the declaration the symbol belongs to. private val delegatedSymbolMap = mutableMapOf() + internal fun deserializeIrSymbol(code: Long): IrSymbol { + return symbolDeserializer.deserializeIrSymbol(code) + } + internal fun deserializeIrSymbolAndRemap(code: Long): IrSymbol { // TODO: could be simplified return symbolDeserializer.deserializeIrSymbol(code).let {