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

FIR2IR: rename unmatchedReceiver -> unmatchedOwner

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-11-09 12:54:16 +01:00
committed by Space Team
parent 08d351db57
commit 4cb41f8e82
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+6 -6
View File
@@ -1277,8 +1277,8 @@ class Fir2IrDeclarationStorage(
createIrFunction(fir, irParent, predefinedOrigin = declarationOrigin).symbol createIrFunction(fir, irParent, predefinedOrigin = declarationOrigin).symbol
} }
is FirSimpleFunction -> { is FirSimpleFunction -> {
val unmatchedReceiver = fakeOverrideOwnerLookupTag != firFunctionSymbol.containingClassLookupTag() val unmatchedOwner = fakeOverrideOwnerLookupTag != firFunctionSymbol.containingClassLookupTag()
if (unmatchedReceiver) { if (unmatchedOwner) {
generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag) generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag)
} }
val originalSymbol = getIrCallableSymbol( val originalSymbol = getIrCallableSymbol(
@@ -1298,7 +1298,7 @@ class Fir2IrDeclarationStorage(
}, },
forceTopLevelPrivate = forceTopLevelPrivate forceTopLevelPrivate = forceTopLevelPrivate
) as IrFunctionSymbol ) as IrFunctionSymbol
if (unmatchedReceiver && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { if (unmatchedOwner && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) {
val originalFunction = originalSymbol.owner as IrSimpleFunction val originalFunction = originalSymbol.owner as IrSimpleFunction
fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalFunction) as IrFunctionSymbol? ?: originalSymbol fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalFunction) as IrFunctionSymbol? ?: originalSymbol
} else { } else {
@@ -1346,8 +1346,8 @@ class Fir2IrDeclarationStorage(
return localStorage.getDelegatedProperty(fir)?.symbol ?: getIrVariableSymbol(fir) return localStorage.getDelegatedProperty(fir)?.symbol ?: getIrVariableSymbol(fir)
} }
val containingClassLookupTag = firPropertySymbol.containingClassLookupTag() val containingClassLookupTag = firPropertySymbol.containingClassLookupTag()
val unmatchedReceiver = fakeOverrideOwnerLookupTag != containingClassLookupTag val unmatchedOwner = fakeOverrideOwnerLookupTag != containingClassLookupTag
if (unmatchedReceiver) { if (unmatchedOwner) {
generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag) generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag)
} }
@@ -1387,7 +1387,7 @@ class Fir2IrDeclarationStorage(
return containingClassLookupTag.getIrCallableSymbol() return containingClassLookupTag.getIrCallableSymbol()
} }
return if (unmatchedReceiver && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { return if (unmatchedOwner && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) {
fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalProperty) as IrPropertySymbol fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalProperty) as IrPropertySymbol
} else { } else {
originalSymbol originalSymbol