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

[FIR2IR] Slightly cleanup FakeOverrideGenerator

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2024-02-23 10:21:12 +02:00
committed by Space Team
parent ef8f954586
commit ebeba231a0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+2 -3
View File
@@ -180,7 +180,7 @@ class FakeOverrideGenerator(
createFakeOverriddenIfNeeded( createFakeOverriddenIfNeeded(
firClass, irClass, isLocal, propertyOrFieldSymbol, firClass, irClass, isLocal, propertyOrFieldSymbol,
{ field, _, _ -> declarationStorage.getCachedIrFieldStaticFakeOverrideSymbolByDeclaration(field) }, { field, _, _ -> declarationStorage.getCachedIrFieldStaticFakeOverrideSymbolByDeclaration(field) },
{ field, irParent, _, -> declarationStorage.getOrCreateIrField(field, irParent) }, { field, irParent, _ -> declarationStorage.getOrCreateIrField(field, irParent) },
createFakeOverrideSymbol = { firField, _ -> createFakeOverrideSymbol = { firField, _ ->
FirFakeOverrideGenerator.createSubstitutionOverrideField( FirFakeOverrideGenerator.createSubstitutionOverrideField(
session, firField, session, firField,
@@ -303,13 +303,12 @@ class FakeOverrideGenerator(
val scope = klass.unsubstitutedScope() val scope = klass.unsubstitutedScope()
val classLookupTag = klass.symbol.toLookupTag() val classLookupTag = klass.symbol.toLookupTag()
val overriddenFirSymbols = computeBaseSymbols(originalSymbol, directOverridden, scope, classLookupTag) val overriddenFirSymbols = computeBaseSymbols(originalSymbol, directOverridden, scope, classLookupTag)
val superTypes = klass.superConeTypes.toMutableList()
val typeContext = session.typeContext val typeContext = session.typeContext
val overriddenPerSupertype = setMultimapOf<ConeClassLikeLookupTag, S>() val overriddenPerSupertype = setMultimapOf<ConeClassLikeLookupTag, S>()
with(typeContext) { with(typeContext) {
for (symbol in overriddenFirSymbols) { for (symbol in overriddenFirSymbols) {
val symbolDispatchReceiver = symbol.containingClassLookupTag() ?: continue val symbolDispatchReceiver = symbol.containingClassLookupTag() ?: continue
for (superType in superTypes) { for (superType in klass.superConeTypes) {
val compatibleType = superType.anySuperTypeConstructor { val compatibleType = superType.anySuperTypeConstructor {
it.typeConstructor() == symbolDispatchReceiver it.typeConstructor() == symbolDispatchReceiver
} }