From b79903b2f4722f0fc2946b31ad7e545dbe8e9853 Mon Sep 17 00:00:00 2001
From: Georgy Bronnikov <georgy.bronnikov@jetbrains.com>
Date: Tue, 18 Jan 2022 19:18:47 +0300
Subject: [PATCH] Fir2Ir: do generate signatures for private declarations

---
 .../jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt    | 2 +-
 .../kotlin/fir/signaturer/FirBasedSignatureComposer.kt          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
index 55e3e568561..2b12d77f121 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
@@ -821,7 +821,7 @@ class Fir2IrDeclarationStorage(
         thisReceiverOwner: IrClass? = irParent as? IrClass,
         predefinedOrigin: IrDeclarationOrigin? = null,
         isLocal: Boolean = false,
-        containingClass: ConeClassLikeLookupTag? = null,
+        containingClass: ConeClassLikeLookupTag? = (irParent as? IrClass)?.classId?.let { ConeClassLikeLookupTagImpl(it) },
     ): IrProperty = convertCatching(property) {
         val origin = property.computeIrOrigin(predefinedOrigin)
         val signature = if (isLocal) null else signatureComposer.composeSignature(property, containingClass)
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
index 4ca0d045d74..cb50961ca4a 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
@@ -91,14 +91,12 @@ class FirBasedSignatureComposer(override val mangler: FirMangler) : Fir2IrSignat
                 )
             }
             is FirTypeAlias -> {
-                if (declaration.visibility == Visibilities.Private) return null
                 val classId = declaration.symbol.classId
                 IdSignature.CommonSignature(
                     classId.packageFqName.asString(), classId.relativeClassName.asString(), builder.hashId, builder.mask
                 )
             }
             is FirCallableDeclaration -> {
-                if (declaration.visibility == Visibilities.Private && !isTopLevelPrivate(declaration, containingClass)) return null
                 val containingClassId = containingClass?.classId
 
                 val classId = containingClassId ?: declaration.containingClass()?.classId