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

[minor] FIR: Fix Fir2ir jvmmappedscope functions origins

Browse Source
This commit is contained in:
Ilya Chernikov
2021-06-17 14:10:22 +02:00
committed by TeamCityServer
parent 6001a81a30
commit a2385b5edd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+7 -5
View File
@@ -1200,11 +1200,13 @@ class Fir2IrDeclarationStorage(
private fun computeDeclarationOrigin(
symbol: FirCallableSymbol<*>,
parentOrigin: IrDeclarationOrigin
): IrDeclarationOrigin {
return if (symbol.fir.isIntersectionOverride || symbol.fir.isSubstitutionOverride)
IrDeclarationOrigin.FAKE_OVERRIDE
else
parentOrigin
): IrDeclarationOrigin = when {
symbol.fir.isIntersectionOverride || symbol.fir.isSubstitutionOverride -> IrDeclarationOrigin.FAKE_OVERRIDE
parentOrigin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB &&
(symbol.fir.origin is FirDeclarationOrigin.Enhancement || symbol.fir.origin is FirDeclarationOrigin.Java) -> {
IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
}
else -> parentOrigin
}
fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {