| commit | 6bb16016fb8a2e11772dd147fbdeab3ca34f1d60 | [log] [tgz] |
|---|---|---|
| author | Georgy Bronnikov <georgy.bronnikov@jetbrains.com> | Wed Mar 23 13:28:44 2022 +0300 |
| committer | Georgy Bronnikov <georgy.bronnikov@jetbrains.com> | Wed Mar 23 13:28:44 2022 +0300 |
| tree | 41aca5066395f5fd34cd06bb31c7e1039c98f20c | |
| parent | b7fad1db2132a4993dbf18fcc4502bff11bc3930 [diff] |
Revert "Psi2Ir: only create file local signatures for callables" This reverts commit dadd4ada6ce66abdee22eb129afcc5711282cd5a.
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 730770f..4322646 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,9 +54,7 @@ get() = visibility == DescriptorVisibilities.PRIVATE private val DeclarationDescriptorWithVisibility.isTopLevelPrivate: Boolean - get() = isPrivate && - this is CallableMemberDescriptor && - mangler.run { !isPlatformSpecificExport() } && containingDeclaration is PackageFragmentDescriptor + get() = isPrivate && mangler.run { !isPlatformSpecificExport() } && containingDeclaration is PackageFragmentDescriptor override fun visitPackageFragmentDescriptor(descriptor: PackageFragmentDescriptor, data: Nothing?) { packageFqn = descriptor.fqName
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureSerializer.kt index f982e19..9c8487d 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureSerializer.kt
@@ -104,7 +104,6 @@ private val IrDeclarationWithVisibility.isTopLevelPrivate: Boolean get() = visibility == DescriptorVisibilities.PRIVATE && !checkIfPlatformSpecificExport() && - this is IrOverridableMember && (parent is IrPackageFragment || parent.isFacadeClass) override fun visitClass(declaration: IrClass) {