From 533d824eb30b12d34e0f38f05c93989a1730aa28 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 20 Nov 2023 19:25:44 +0200 Subject: [PATCH] [FIR2IR] Minor: simplify function in FakeOverrideGenerator --- .../src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt | 4 +--- .../kotlin/fir/backend/generators/FakeOverrideGenerator.kt | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt index d509e0db14a..6be1c667ce5 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt @@ -280,9 +280,7 @@ class Fir2IrConverter( } declarationStorage.leaveScope(irConstructor.symbol) } - with(fakeOverrideGenerator) { - irClass.computeFakeOverrides(klass, allDeclarations) - } + fakeOverrideGenerator.computeFakeOverrides(klass, irClass, allDeclarations) return irClass } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt index 42137f50d6b..8993cadab40 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt @@ -57,15 +57,15 @@ class FakeOverrideGenerator( } } - fun IrClass.computeFakeOverrides(klass: FirClass, realDeclarations: Collection) { + fun computeFakeOverrides(firClass: FirClass, irClass: IrClass, realDeclarations: Collection) { val result = mutableListOf() - val useSiteMemberScope = klass.unsubstitutedScope() + val useSiteMemberScope = firClass.unsubstitutedScope() val superTypesCallableNames = useSiteMemberScope.getCallableNames() val realDeclarationSymbols = realDeclarations.mapTo(mutableSetOf(), FirDeclaration::symbol) for (name in superTypesCallableNames) { - generateFakeOverridesForName(this, useSiteMemberScope, name, klass, result, realDeclarationSymbols) + generateFakeOverridesForName(irClass, useSiteMemberScope, name, firClass, result, realDeclarationSymbols) } }