azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IR: remove IdSignatureBuilder.isKotlinPackage()

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-12-15 15:17:55 +03:00
committed by TeamCityServer
parent 6a3a375372
commit f0fb0cbefe
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureBuilder.kt
-2
View File
@@ -106,8 +106,6 @@ abstract class IdSignatureBuilder<D> {
protected open fun platformSpecificAlias(descriptor: TypeAliasDescriptor) {} protected open fun platformSpecificAlias(descriptor: TypeAliasDescriptor) {}
protected open fun platformSpecificPackage(descriptor: PackageFragmentDescriptor) {} protected open fun platformSpecificPackage(descriptor: PackageFragmentDescriptor) {}
protected open fun isKotlinPackage(descriptor: PackageFragmentDescriptor): Boolean = true
fun buildSignature(declaration: D): IdSignature { fun buildSignature(declaration: D): IdSignature {
reset() reset()
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
+1 -1
View File
@@ -54,7 +54,7 @@ open class IdSignatureDescriptor(private val mangler: KotlinMangler.DescriptorMa
get() = visibility == DescriptorVisibilities.PRIVATE get() = visibility == DescriptorVisibilities.PRIVATE
private val DeclarationDescriptorWithVisibility.isTopLevelPrivate: Boolean 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?) { override fun visitPackageFragmentDescriptor(descriptor: PackageFragmentDescriptor, data: Nothing?) {
packageFqn = descriptor.fqName packageFqn = descriptor.fqName
compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIdSignatureDescriptor.kt
-6
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.ir.util.IdSignature
import org.jetbrains.kotlin.ir.util.KotlinMangler import org.jetbrains.kotlin.ir.util.KotlinMangler
import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyDescriptor 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.name.FqName
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.descriptorUtil.overriddenTreeAsSequence import org.jetbrains.kotlin.resolve.descriptorUtil.overriddenTreeAsSequence
@@ -33,11 +32,6 @@ class JvmIdSignatureDescriptor(mangler: KotlinMangler.DescriptorMangler) : IdSig
computeStoredFileSignature(descriptor) computeStoredFileSignature(descriptor)
} }
override fun isKotlinPackage(descriptor: PackageFragmentDescriptor): Boolean {
return true
// return descriptor !is LazyJavaPackageFragment
}
override fun platformSpecificClass(descriptor: ClassDescriptor) { override fun platformSpecificClass(descriptor: ClassDescriptor) {
computeStoredFileSignature(descriptor) computeStoredFileSignature(descriptor)
} }