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

Fir2Ir: use class id when determining whether declaration is toplevel

Browse Source
This commit is contained in:
Georgy Bronnikov
2022-03-26 16:26:59 +03:00
committed by Alexander Udalov
parent 39bba7973c
commit 536bd99fe7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirBasedSignatureComposer.kt
+3 -3
View File
@@ -121,7 +121,7 @@ class FirBasedSignatureComposer(override val mangler: FirMangler) : Fir2IrSignat
} }
else -> error("Unsupported FIR declaration in signature composer: ${declaration.render()}") else -> error("Unsupported FIR declaration in signature composer: ${declaration.render()}")
} }
return if (isTopLevelPrivate(declaration, containingClass) || forceTopLevelPrivate) { return if (isTopLevelPrivate(declaration) || forceTopLevelPrivate) {
val fileSig = fileSignature ?: return null val fileSig = fileSignature ?: return null
IdSignature.CompositeSignature(fileSig, publicSignature) IdSignature.CompositeSignature(fileSig, publicSignature)
} else } else
@@ -178,8 +178,8 @@ class FirBasedSignatureComposer(override val mangler: FirMangler) : Fir2IrSignat
} else accessorSig } else accessorSig
} }
private fun isTopLevelPrivate(declaration: FirDeclaration, containingClass: ConeClassLikeLookupTag?): Boolean = private fun isTopLevelPrivate(declaration: FirDeclaration): Boolean =
containingClass == null && declaration is FirMemberDeclaration && declaration.visibility == Visibilities.Private declaration.symbol.getOwnerLookupTag() == null && declaration is FirMemberDeclaration && declaration.visibility == Visibilities.Private
private fun FirProperty.getterOrDefault() = private fun FirProperty.getterOrDefault() =
getter ?: FirDefaultPropertyGetter( getter ?: FirDefaultPropertyGetter(