Fir2IrDeclarationStorage: reorder functions slightly
This commit is contained in:
+13
-13
@@ -1089,19 +1089,6 @@ class Fir2IrDeclarationStorage(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun computeDeclarationOrigin(
|
|
||||||
symbol: FirCallableSymbol<*>,
|
|
||||||
parentOrigin: IrDeclarationOrigin,
|
|
||||||
irParent: IrDeclarationParent?
|
|
||||||
): IrDeclarationOrigin {
|
|
||||||
return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride)
|
|
||||||
IrDeclarationOrigin.FAKE_OVERRIDE
|
|
||||||
else
|
|
||||||
parentOrigin
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun IrDeclarationParent?.isSourceClass() = this is IrClass && this !is Fir2IrLazyClass && this !is IrLazyClass
|
|
||||||
|
|
||||||
fun getIrPropertySymbol(firPropertySymbol: FirPropertySymbol): IrSymbol {
|
fun getIrPropertySymbol(firPropertySymbol: FirPropertySymbol): IrSymbol {
|
||||||
val fir = firPropertySymbol.fir
|
val fir = firPropertySymbol.fir
|
||||||
if (fir.isLocal) {
|
if (fir.isLocal) {
|
||||||
@@ -1145,6 +1132,19 @@ class Fir2IrDeclarationStorage(
|
|||||||
}.symbol
|
}.symbol
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun computeDeclarationOrigin(
|
||||||
|
symbol: FirCallableSymbol<*>,
|
||||||
|
parentOrigin: IrDeclarationOrigin,
|
||||||
|
irParent: IrDeclarationParent?
|
||||||
|
): IrDeclarationOrigin {
|
||||||
|
return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride)
|
||||||
|
IrDeclarationOrigin.FAKE_OVERRIDE
|
||||||
|
else
|
||||||
|
parentOrigin
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun IrDeclarationParent?.isSourceClass() = this is IrClass && this !is Fir2IrLazyClass && this !is IrLazyClass
|
||||||
|
|
||||||
fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {
|
fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {
|
||||||
val fir = firFieldSymbol.fir
|
val fir = firFieldSymbol.fir
|
||||||
val irProperty = fieldCache[fir] ?: createIrField(fir).apply {
|
val irProperty = fieldCache[fir] ?: createIrField(fir).apply {
|
||||||
|
|||||||
Reference in New Issue
Block a user