From 4cb41f8e826decf0656fcddeb476b6e55ff53044 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 9 Nov 2022 12:54:16 +0100 Subject: [PATCH] FIR2IR: rename unmatchedReceiver -> unmatchedOwner --- .../kotlin/fir/backend/Fir2IrDeclarationStorage.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 86ae8fa850e..7a17d92201d 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -1277,8 +1277,8 @@ class Fir2IrDeclarationStorage( createIrFunction(fir, irParent, predefinedOrigin = declarationOrigin).symbol } is FirSimpleFunction -> { - val unmatchedReceiver = fakeOverrideOwnerLookupTag != firFunctionSymbol.containingClassLookupTag() - if (unmatchedReceiver) { + val unmatchedOwner = fakeOverrideOwnerLookupTag != firFunctionSymbol.containingClassLookupTag() + if (unmatchedOwner) { generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag) } val originalSymbol = getIrCallableSymbol( @@ -1298,7 +1298,7 @@ class Fir2IrDeclarationStorage( }, forceTopLevelPrivate = forceTopLevelPrivate ) as IrFunctionSymbol - if (unmatchedReceiver && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { + if (unmatchedOwner && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { val originalFunction = originalSymbol.owner as IrSimpleFunction fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalFunction) as IrFunctionSymbol? ?: originalSymbol } else { @@ -1346,8 +1346,8 @@ class Fir2IrDeclarationStorage( return localStorage.getDelegatedProperty(fir)?.symbol ?: getIrVariableSymbol(fir) } val containingClassLookupTag = firPropertySymbol.containingClassLookupTag() - val unmatchedReceiver = fakeOverrideOwnerLookupTag != containingClassLookupTag - if (unmatchedReceiver) { + val unmatchedOwner = fakeOverrideOwnerLookupTag != containingClassLookupTag + if (unmatchedOwner) { generateLazyFakeOverrides(fir.name, fakeOverrideOwnerLookupTag) } @@ -1387,7 +1387,7 @@ class Fir2IrDeclarationStorage( return containingClassLookupTag.getIrCallableSymbol() } - return if (unmatchedReceiver && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { + return if (unmatchedOwner && fakeOverrideOwnerLookupTag is ConeClassLookupTagWithFixedSymbol) { fakeOverrideOwnerLookupTag.findIrFakeOverride(fir.name, originalProperty) as IrPropertySymbol } else { originalSymbol