From f8be378a65c20b262608aa6cf52561ae4553fe87 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 14 Mar 2019 00:15:25 +0300 Subject: [PATCH] Port of native fix to common deserializer * commit 347e2dadc6890341b4f3262fb85b6f6513f5b940 | Author: Igor Chevdar | Date: Wed Mar 6 12:51:40 2019 +0300 | | [Serializer] More graceful fix of parents --- .../kotlin/backend/common/serialization/KotlinIrLinker.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt index 9c320393abd..a0cc7f2342b 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt @@ -229,7 +229,9 @@ abstract class KotlinIrLinker( deserializedModuleDescriptor = key.moduleOfOrigin val reachable = deserializeTopLevelDeclaration(key) - reversedFileIndex[key]!!.declarations.add(reachable) + val file = reversedFileIndex[key]!! + file.declarations.add(reachable) + reachable.patchDeclarationParents(file) reachableTopLevels.remove(key) deserializedTopLevels.add(key)