diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt index ee00ae061a1..ef73f9b1b52 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt @@ -48,7 +48,7 @@ public class LazyJavaPackageScope( public val kotlinBinaryClass: KotlinJvmBinaryClass? = c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName)) - public val kotlinBinaryClasses: List by lazy { + private val kotlinBinaryClasses = c.storageManager.createLazyValue { val simpleNames = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString()) val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName @@ -59,10 +59,10 @@ public class LazyJavaPackageScope( } private val deserializedPackageScope = c.storageManager.createLazyValue { - if (kotlinBinaryClasses.isEmpty()) + if (kotlinBinaryClasses().isEmpty()) JetScope.Empty else { - c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses) + c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses()) } }