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

Fir2Ir: do generate signatures for private declarations

Browse Source
This commit is contained in:
Georgy Bronnikov
2022-01-18 19:18:47 +03:00
committed by Alexander Udalov
parent a251a49664
commit b79903b2f4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+1 -1
View File
@@ -821,7 +821,7 @@ class Fir2IrDeclarationStorage(
thisReceiverOwner: IrClass? = irParent as? IrClass, thisReceiverOwner: IrClass? = irParent as? IrClass,
predefinedOrigin: IrDeclarationOrigin? = null, predefinedOrigin: IrDeclarationOrigin? = null,
isLocal: Boolean = false, isLocal: Boolean = false,
containingClass: ConeClassLikeLookupTag? = null, containingClass: ConeClassLikeLookupTag? = (irParent as? IrClass)?.classId?.let { ConeClassLikeLookupTagImpl(it) },
): IrProperty = convertCatching(property) { ): IrProperty = convertCatching(property) {
val origin = property.computeIrOrigin(predefinedOrigin) val origin = property.computeIrOrigin(predefinedOrigin)
val signature = if (isLocal) null else signatureComposer.composeSignature(property, containingClass) val signature = if (isLocal) null else signatureComposer.composeSignature(property, containingClass)
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
-2
View File
@@ -91,14 +91,12 @@ class FirBasedSignatureComposer(override val mangler: FirMangler) : Fir2IrSignat
) )
} }
is FirTypeAlias -> { is FirTypeAlias -> {
if (declaration.visibility == Visibilities.Private) return null
val classId = declaration.symbol.classId val classId = declaration.symbol.classId
IdSignature.CommonSignature( IdSignature.CommonSignature(
classId.packageFqName.asString(), classId.relativeClassName.asString(), builder.hashId, builder.mask classId.packageFqName.asString(), classId.relativeClassName.asString(), builder.hashId, builder.mask
) )
} }
is FirCallableDeclaration -> { is FirCallableDeclaration -> {
if (declaration.visibility == Visibilities.Private && !isTopLevelPrivate(declaration, containingClass)) return null
val containingClassId = containingClass?.classId val containingClassId = containingClass?.classId
val classId = containingClassId ?: declaration.containingClass()?.classId val classId = containingClassId ?: declaration.containingClass()?.classId