From f0fb0cbefe36af19dcc5868024c51d73c5f5dc8e Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Wed, 15 Dec 2021 15:17:55 +0300 Subject: [PATCH] IR: remove IdSignatureBuilder.isKotlinPackage() --- .../common/serialization/signature/IdSignatureBuilder.kt | 2 -- .../common/serialization/signature/IdSignatureDescriptor.kt | 2 +- .../backend/jvm/serialization/JvmIdSignatureDescriptor.kt | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt index 85edd79126a..ca5795f66a6 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt @@ -106,8 +106,6 @@ abstract class IdSignatureBuilder { protected open fun platformSpecificAlias(descriptor: TypeAliasDescriptor) {} protected open fun platformSpecificPackage(descriptor: PackageFragmentDescriptor) {} - protected open fun isKotlinPackage(descriptor: PackageFragmentDescriptor): Boolean = true - fun buildSignature(declaration: D): IdSignature { reset() diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt index c1d463e34a4..4322646eef3 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt @@ -54,7 +54,7 @@ open class IdSignatureDescriptor(private val mangler: KotlinMangler.DescriptorMa get() = visibility == DescriptorVisibilities.PRIVATE private val DeclarationDescriptorWithVisibility.isTopLevelPrivate: Boolean - get() = isPrivate && mangler.run { !isPlatformSpecificExport() } && containingDeclaration?.let { it is PackageFragmentDescriptor && isKotlinPackage(it) } ?: false + get() = isPrivate && mangler.run { !isPlatformSpecificExport() } && containingDeclaration is PackageFragmentDescriptor override fun visitPackageFragmentDescriptor(descriptor: PackageFragmentDescriptor, data: Nothing?) { packageFqn = descriptor.fqName diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIdSignatureDescriptor.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIdSignatureDescriptor.kt index de919f485c3..d74c56b8503 100644 --- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIdSignatureDescriptor.kt +++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIdSignatureDescriptor.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.ir.util.KotlinMangler import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyDescriptor -import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.overriddenTreeAsSequence @@ -33,11 +32,6 @@ class JvmIdSignatureDescriptor(mangler: KotlinMangler.DescriptorMangler) : IdSig computeStoredFileSignature(descriptor) } - override fun isKotlinPackage(descriptor: PackageFragmentDescriptor): Boolean { - return true -// return descriptor !is LazyJavaPackageFragment - } - override fun platformSpecificClass(descriptor: ClassDescriptor) { computeStoredFileSignature(descriptor) }