From a3241637cee6dd5b423c74c0c921f4f44bd1ecf6 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Sun, 8 Nov 2015 03:11:25 +0300 Subject: [PATCH] #fix KT-9881 Incorrect error re: internal visibility #KT-9881 Fixed --- .../jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt index 7aa10a4c78a..e9011a7015f 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider import org.jetbrains.kotlin.modules.Module import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import java.io.File interface ModuleVisibilityManager { @@ -53,7 +54,12 @@ public fun isContainedByCompiledPartOfOurModule(descriptor: DeclarationDescripto is KotlinJvmBinarySourceElement -> source.binaryClass is KotlinJvmBinaryPackageSourceElement -> - source.getRepresentativeBinaryClass() + if (descriptor is DeserializedCallableMemberDescriptor) { + source.getContainingBinaryClass(descriptor) ?: source.getRepresentativeBinaryClass() + } + else { + source.getRepresentativeBinaryClass() + } else -> null }