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

JVM_IR: avoid duplication in declaration lists during deserialization

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-06-24 21:44:54 +03:00
committed by TeamCityServer
parent fa4efd3303
commit dffb22de9d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
+3 -1
View File
@@ -325,9 +325,11 @@ class IrDeclarationDeserializer(
superTypes = proto.superTypeList.map { deserializeIrType(it) } superTypes = proto.superTypeList.map { deserializeIrType(it) }
withExternalValue(isExternal) { withExternalValue(isExternal) {
val oldDeclarations = declarations.toSet()
proto.declarationList proto.declarationList
.filterNot { isSkippableFakeOverride(it, this) } .filterNot { isSkippableFakeOverride(it, this) }
.mapNotNullTo(declarations) { declProto -> deserializeDeclaration(declProto) } // On JVM, deserialization may fill bodies of existing declarations, so avoid adding duplicates.
.mapNotNullTo(declarations) { declProto -> deserializeDeclaration(declProto).takeIf { it !in oldDeclarations } }
} }
thisReceiver = deserializeIrValueParameter(proto.thisReceiver, -1) thisReceiver = deserializeIrValueParameter(proto.thisReceiver, -1)