From ebeba231a05dd6508eec5d43e4b9f545cc83aa4f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 23 Feb 2024 10:21:12 +0200 Subject: [PATCH] [FIR2IR] Slightly cleanup FakeOverrideGenerator --- .../kotlin/fir/backend/generators/FakeOverrideGenerator.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 1d653dd29a2..2623a7dda61 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 @@ -180,7 +180,7 @@ class FakeOverrideGenerator( createFakeOverriddenIfNeeded( firClass, irClass, isLocal, propertyOrFieldSymbol, { field, _, _ -> declarationStorage.getCachedIrFieldStaticFakeOverrideSymbolByDeclaration(field) }, - { field, irParent, _, -> declarationStorage.getOrCreateIrField(field, irParent) }, + { field, irParent, _ -> declarationStorage.getOrCreateIrField(field, irParent) }, createFakeOverrideSymbol = { firField, _ -> FirFakeOverrideGenerator.createSubstitutionOverrideField( session, firField, @@ -303,13 +303,12 @@ class FakeOverrideGenerator( val scope = klass.unsubstitutedScope() val classLookupTag = klass.symbol.toLookupTag() val overriddenFirSymbols = computeBaseSymbols(originalSymbol, directOverridden, scope, classLookupTag) - val superTypes = klass.superConeTypes.toMutableList() val typeContext = session.typeContext val overriddenPerSupertype = setMultimapOf() with(typeContext) { for (symbol in overriddenFirSymbols) { val symbolDispatchReceiver = symbol.containingClassLookupTag() ?: continue - for (superType in superTypes) { + for (superType in klass.superConeTypes) { val compatibleType = superType.anySuperTypeConstructor { it.typeConstructor() == symbolDispatchReceiver }