From ee6d70fb0f8aec296d3d2c5ac79a074c738391dd Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 27 Apr 2017 15:04:04 +0300 Subject: [PATCH] When searching a descriptor by name, only search in exported symbols. --- .../backend/konan/serialization/IrDescriptorDeserializer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt index 0cf20d5b910..fb639dd8a61 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.backend.konan.Context import org.jetbrains.kotlin.backend.konan.KonanIrDeserializationException import org.jetbrains.kotlin.backend.konan.descriptors.contributedMethods import org.jetbrains.kotlin.backend.konan.descriptors.isFunctionInvoke +import org.jetbrains.kotlin.backend.konan.llvm.isExported import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.ir.expressions.IrLoop @@ -438,7 +439,7 @@ internal class IrDescriptorDeserializer(val context: Context, fun findInTheDescriptorTree(proto: KonanIr.KotlinDescriptor): DeclarationDescriptor? { - val matchingNames = matchNameInParentScope(proto) + val matchingNames = matchNameInParentScope(proto).filter{it.isExported()} if (matchingNames.size == 0) return null val originalDescriptor = selectAmongMatchingNames(matchingNames, proto)