From 32bbc3b8ad3b83cb6a2a2522d9e6a5693443dfcc Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 7 Jun 2021 14:44:07 +0300 Subject: [PATCH] [KLIB] Fix SimpleTypeKey in case of type abbreviation --- .../kotlin/backend/common/serialization/IrFileSerializer.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 780d051a158..3a3a9aff456 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 @@ -381,7 +381,8 @@ open class IrFileSerializer( val classifier: IrClassifierSymbol?, val hasQuestionMark: Boolean?, val arguments: List?, - val annotations: List + val annotations: List, + val abbreviation: IrTypeAbbreviation? ) data class IrTypeArgumentKey( @@ -401,7 +402,8 @@ open class IrFileSerializer( classifier = this.classifierOrNull, hasQuestionMark = (this as? IrSimpleType)?.hasQuestionMark, arguments = (this as? IrSimpleType)?.arguments?.map { it.toIrTypeArgumentKey }, - annotations = this.annotations + annotations = this.annotations, + abbreviation = (this as? IrSimpleType)?.abbreviation ) private val IrTypeArgument.toIrTypeArgumentKey: IrTypeArgumentKey