Match triangle & diamond intersections in FirTypeIntersectionScope

compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java

@@ -2651,6 +2651,16 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
             runTest("compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.kt");
         }
 
+        @TestMetadata("doubleGenericDiamond.kt")
+        public void testDoubleGenericDiamond() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/problems/doubleGenericDiamond.kt");
+        }
+
+        @TestMetadata("falseIntersection.kt")
+        public void testFalseIntersection() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/problems/falseIntersection.kt");
+        }
+
         @TestMetadata("flexibleTypeVarAgainstNull.kt")
         public void testFlexibleTypeVarAgainstNull() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.kt");
@@ -2705,6 +2715,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         public void testSecondaryConstructorCfg() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.kt");
         }
+
+        @TestMetadata("transform.kt")
+        public void testTransform() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/problems/transform.kt");
+        }
     }
 
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")

compiler/fir/analysis-tests/testData/resolve/problems/doubleGenericDiamond.fir.txt

@@ -0,0 +1,41 @@
+FILE: doubleGenericDiamond.kt
+    public abstract interface Left : R|kotlin/Any| {
+    }
+    public abstract interface Right : R|kotlin/Any| {
+    }
+    public final class Bottom : R|Left|, R|Right| {
+        public constructor(): R|Bottom| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public abstract interface A<T> : R|kotlin/Any| {
+        public open fun f(): R|T?| {
+            ^f Null(null)
+        }
+
+    }
+    public abstract interface B<T : R|Left|> : R|A<T>| {
+        public open override fun f(): R|T?| {
+            ^f Null(null)
+        }
+
+    }
+    public abstract class C<T> : R|A<T>| {
+        public constructor<T>(): R|C<T>| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public abstract class D<T : R|Right|> : R|C<T>| {
+        public constructor<T : R|Right|>(): R|D<T>| {
+            super<R|C<T>|>()
+        }
+
+    }
+    public final class Z : R|D<Bottom>|, R|B<Bottom>| {
+        public constructor(): R|Z| {
+            super<R|D<Bottom>|>()
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolve/problems/doubleGenericDiamond.kt

@@ -0,0 +1,22 @@
+interface Left
+interface Right
+class Bottom : Left, Right
+
+interface A<T> {
+    fun f(): T? {
+        return null
+    }
+}
+
+interface B<T : Left> : A<T> {
+    override fun f(): T? {
+        return null
+    }
+}
+
+abstract class C<T> : A<T>
+
+abstract class D<T : Right> : C<T>()
+
+// We should not have intersection override f() in this class
+class Z : D<Bottom>(), B<Bottom>

compiler/fir/analysis-tests/testData/resolve/problems/falseIntersection.fir.txt

@@ -0,0 +1,17 @@
+FILE: falseIntersection.kt
+    public abstract interface A : R|kotlin/Any| {
+        public open fun foo(): R|kotlin/Unit| {
+        }
+
+    }
+    public abstract interface B : R|A| {
+        public open override fun foo(): R|kotlin/Unit| {
+        }
+
+    }
+    public final class C : R|B|, R|A| {
+        public constructor(): R|C| {
+            super<R|kotlin/Any|>()
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolve/problems/falseIntersection.kt

@@ -0,0 +1,10 @@
+interface A {
+    fun foo() {}
+}
+
+interface B : A {
+    override fun foo() {}
+}
+
+// We should not have intersection override foo() in this class
+class C : B, A

compiler/fir/analysis-tests/testData/resolve/problems/transform.fir.txt

@@ -0,0 +1,160 @@
+FILE: transform.kt
+    public sealed class CompositeTransformResult<out T : R|kotlin/Any|> : R|kotlin/Any| {
+        protected constructor<out T : R|kotlin/Any|>(): R|CompositeTransformResult<T>| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final class Single<out T : R|kotlin/Any|> : R|CompositeTransformResult<T>| {
+            public constructor<out T : R|kotlin/Any|>(_single: R|T|): R|CompositeTransformResult.Single<T>| {
+                super<R|CompositeTransformResult<T>|>()
+            }
+
+            public final val _single: R|T| = R|<local>/_single|
+                public get(): R|T|
+
+        }
+
+        public final class Multiple<out T : R|kotlin/Any|> : R|CompositeTransformResult<T>| {
+            public constructor<out T : R|kotlin/Any|>(_list: R|kotlin/collections/List<T>|): R|CompositeTransformResult.Multiple<T>| {
+                super<R|CompositeTransformResult<T>|>()
+            }
+
+            public final val _list: R|kotlin/collections/List<T>| = R|<local>/_list|
+                public get(): R|kotlin/collections/List<T>|
+
+        }
+
+        public final companion object Companion : R|kotlin/Any| {
+            private constructor(): R|CompositeTransformResult.Companion| {
+                super<R|kotlin/Any|>()
+            }
+
+            public final fun <T : R|kotlin/Any|> single(t: R|T|): R|CompositeTransformResult.Single<T>| {
+                ^single R|SubstitutionOverride</CompositeTransformResult.Single.Single>|<R|T|>(R|<local>/t|)
+            }
+
+            public final fun <T : R|kotlin/Any|> many(l: R|kotlin/collections/List<T>|): R|CompositeTransformResult.Multiple<T>| {
+                ^many R|SubstitutionOverride</CompositeTransformResult.Multiple.Multiple>|<R|T|>(R|<local>/l|)
+            }
+
+        }
+
+        public final val single: R|T|
+            public get(): R|T| {
+                ^ ((this@R|/CompositeTransformResult| as R|CompositeTransformResult.Single<*>|).R|SubstitutionOverride</CompositeTransformResult.Single._single: R|CapturedType(*)|>| as R|T|)
+            }
+
+    }
+    public abstract interface FirElement : R|kotlin/Any| {
+        public abstract fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+        public open fun accept(visitor: R|FirVisitorVoid|): R|kotlin/Unit| {
+            ^accept this@R|/FirElement|.R|/FirElement.accept|<R|kotlin/Unit|, R|kotlin/Nothing?|>(R|<local>/visitor|, Null(null))
+        }
+
+        public abstract fun <E : R|FirElement|, D> transform(visitor: R|FirTransformer<D>|, data: R|D|): R|CompositeTransformResult<E>|
+
+    }
+    public abstract class FirVisitor<out R, in D> : R|kotlin/Any| {
+        public constructor<out R, in D>(): R|FirVisitor<R, D>| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public abstract class FirVisitorVoid : R|FirVisitor<kotlin/Unit, kotlin/Nothing?>| {
+        public constructor(): R|FirVisitorVoid| {
+            super<R|FirVisitor<kotlin/Unit, kotlin/Nothing?>|>()
+        }
+
+    }
+    public abstract class FirTransformer<in D> : R|FirVisitor<CompositeTransformResult<FirElement>, D>| {
+        public constructor<in D>(): R|FirTransformer<D>| {
+            super<R|FirVisitor<CompositeTransformResult<FirElement>, D>|>()
+        }
+
+    }
+    public abstract interface FirAnnotationContainer : R|FirElement| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirStatement : R|FirAnnotationContainer| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirTypeParameterRefsOwner : R|FirElement| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirDeclaration : R|FirElement| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirAnnotatedDeclaration : R|FirDeclaration|, R|FirAnnotationContainer| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirSymbolOwner<E : R|FirSymbolOwner<E>|, R|FirDeclaration|> : R|FirElement| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirClassLikeDeclaration<F : R|FirClassLikeDeclaration<F>|> : R|FirAnnotatedDeclaration|, R|FirStatement|, R|FirSymbolOwner<F>| {
+    }
+    public abstract interface FirClass<F : R|FirClass<F>|> : R|FirClassLikeDeclaration<F>|, R|FirStatement|, R|FirTypeParameterRefsOwner| {
+    }
+    private final class FirApplySupertypesTransformer : R|FirTransformer<kotlin/Nothing?>| {
+        public constructor(): R|FirApplySupertypesTransformer| {
+            super<R|FirTransformer<kotlin/Nothing?>|>()
+        }
+
+    }
+    public final fun <F : R|FirClass<F>|> R|F|.runSupertypeResolvePhaseForLocalClass(): R|F| {
+        lval applySupertypesTransformer: R|FirApplySupertypesTransformer| = R|/FirApplySupertypesTransformer.FirApplySupertypesTransformer|()
+        ^runSupertypeResolvePhaseForLocalClass this@R|/runSupertypeResolvePhaseForLocalClass|.R|SubstitutionOverride</FirClass.transform: R|CompositeTransformResult<E>|>|<R|F|, R|kotlin/Nothing?|>(R|<local>/applySupertypesTransformer|, Null(null)).R|SubstitutionOverride</CompositeTransformResult.single: R|F|>|
+    }
+    public abstract class FirPureAbstractElement : R|FirElement| {
+        public constructor(): R|FirPureAbstractElement| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public abstract interface FirTypedDeclaration : R|FirAnnotatedDeclaration| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract interface FirCallableDeclaration<F : R|FirCallableDeclaration<F>|> : R|FirTypedDeclaration|, R|FirSymbolOwner<F>| {
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract class FirVariable<F : R|FirVariable<F>|> : R|FirPureAbstractElement|, R|FirCallableDeclaration<F>|, R|FirAnnotatedDeclaration|, R|FirStatement| {
+        public constructor<F : R|FirVariable<F>|>(): R|FirVariable<F>| {
+            super<R|FirPureAbstractElement|>()
+        }
+
+        public abstract override fun <R, D> accept(visitor: R|FirVisitor<R, D>|, data: R|D|): R|R|
+
+    }
+    public abstract class FirWhenExpression : R|kotlin/Any| {
+        public constructor(): R|FirWhenExpression| {
+            super<R|kotlin/Any|>()
+        }
+
+        public abstract val subjectVariable: R|FirVariable<*>?|
+            public get(): R|FirVariable<*>?|
+
+    }
+    public final class FirRenderer : R|FirVisitorVoid| {
+        public constructor(): R|FirRenderer| {
+            super<R|FirVisitorVoid|>()
+        }
+
+        public final fun foo(expression: R|FirWhenExpression|): R|kotlin/Unit| {
+            lval variable: R|FirVariable<*>?| = R|<local>/expression|.R|/FirWhenExpression.subjectVariable|
+            when () {
+                !=(R|<local>/variable|, Null(null)) ->  {
+                    R|<local>/variable|.R|/FirElement.accept|(this@R|/FirRenderer|)
+                }
+            }
+
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolve/problems/transform.kt

@@ -0,0 +1,90 @@
+sealed class CompositeTransformResult<out T : Any> {
+
+    class Single<out T : Any>(val _single: T) : CompositeTransformResult<T>()
+
+    class Multiple<out T : Any>(val _list: List<T>) : CompositeTransformResult<T>()
+
+    companion object {
+        fun <T : Any> single(t: T) = Single(t)
+        fun <T : Any> many(l: List<T>) = Multiple(l)
+    }
+
+    val single: T
+        get() = (this as Single<*>)._single as T
+}
+
+interface FirElement {
+    fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+
+    fun accept(visitor: FirVisitorVoid) = accept(visitor, null)
+
+    fun <E : FirElement, D> transform(visitor: FirTransformer<D>, data: D): CompositeTransformResult<E>
+}
+
+abstract class FirVisitor<out R, in D>
+
+abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>()
+
+abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirElement>, D>()
+
+interface FirAnnotationContainer : FirElement {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirStatement : FirAnnotationContainer {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirTypeParameterRefsOwner : FirElement {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirDeclaration : FirElement {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirAnnotatedDeclaration : FirDeclaration, FirAnnotationContainer {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirSymbolOwner<E> : FirElement where E : FirSymbolOwner<E>, E : FirDeclaration {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirClassLikeDeclaration<F : FirClassLikeDeclaration<F>> : FirAnnotatedDeclaration, FirStatement, FirSymbolOwner<F>
+
+interface FirClass<F : FirClass<F>> : FirClassLikeDeclaration<F>, FirStatement, FirTypeParameterRefsOwner
+
+private class FirApplySupertypesTransformer() : FirTransformer<Nothing?>()
+
+fun <F : FirClass<F>> F.runSupertypeResolvePhaseForLocalClass(): F {
+    val applySupertypesTransformer = FirApplySupertypesTransformer()
+    return this.transform<F, Nothing?>(applySupertypesTransformer, null).single
+}
+
+abstract class FirPureAbstractElement : FirElement
+
+interface FirTypedDeclaration : FirAnnotatedDeclaration {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+interface FirCallableDeclaration<F : FirCallableDeclaration<F>> : FirTypedDeclaration, FirSymbolOwner<F> {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+abstract class FirVariable<F : FirVariable<F>> : FirPureAbstractElement(), FirCallableDeclaration<F>, FirAnnotatedDeclaration, FirStatement {
+    abstract override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R
+}
+
+abstract class FirWhenExpression {
+    abstract val subjectVariable: FirVariable<*>?
+}
+
+class FirRenderer : FirVisitorVoid() {
+    fun foo(expression: FirWhenExpression) {
+        val variable = expression.subjectVariable
+        if (variable != null) {
+            variable.accept(this)
+        }
+    }
+}

compiler/fir/analysis-tests/testData/resolve/properties/kotlinOverridesJavaComplex.fir.txt

@@ -23,7 +23,7 @@ FILE: Test.kt
         }
 
         public final fun test(): R|kotlin/String| {
-            ^test this@R|/LightClassWrapper|.R|/LightClassWrapper.typeParameters|.R|/single|()
+            ^test this@R|/LightClassWrapper|.R|/Light.typeParameters|.R|/single|()
         }
 
     }
@@ -47,7 +47,7 @@ FILE: Test.kt
         public final fun test(other: R|kotlin/Any?|): R|kotlin/Unit| {
             when () {
                 (R|<local>/other| is R|LightField<*>|) ->  {
-                    R|<local>/other|.R|/LightField.name|
+                    R|<local>/other|.R|/LightMember.name|
                 }
             }
 

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java

@@ -2999,6 +2999,18 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                 runTest("compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.kt");
             }
 
+            @Test
+            @TestMetadata("doubleGenericDiamond.kt")
+            public void testDoubleGenericDiamond() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/doubleGenericDiamond.kt");
+            }
+
+            @Test
+            @TestMetadata("falseIntersection.kt")
+            public void testFalseIntersection() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/falseIntersection.kt");
+            }
+
             @Test
             @TestMetadata("flexibleTypeVarAgainstNull.kt")
             public void testFlexibleTypeVarAgainstNull() throws Exception {
@@ -3064,6 +3076,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
             public void testSecondaryConstructorCfg() throws Exception {
                 runTest("compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.kt");
             }
+
+            @Test
+            @TestMetadata("transform.kt")
+            public void testTransform() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/transform.kt");
+            }
         }
 
         @Nested

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java

@@ -3033,6 +3033,18 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                 runTest("compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.kt");
             }
 
+            @Test
+            @TestMetadata("doubleGenericDiamond.kt")
+            public void testDoubleGenericDiamond() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/doubleGenericDiamond.kt");
+            }
+
+            @Test
+            @TestMetadata("falseIntersection.kt")
+            public void testFalseIntersection() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/falseIntersection.kt");
+            }
+
             @Test
             @TestMetadata("flexibleTypeVarAgainstNull.kt")
             public void testFlexibleTypeVarAgainstNull() throws Exception {
@@ -3098,6 +3110,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             public void testSecondaryConstructorCfg() throws Exception {
                 runTest("compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.kt");
             }
+
+            @Test
+            @TestMetadata("transform.kt")
+            public void testTransform() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/problems/transform.kt");
+            }
         }
 
         @Nested

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt

@@ -8,15 +8,12 @@ package org.jetbrains.kotlin.fir.scopes.impl
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
-import org.jetbrains.kotlin.fir.originalForIntersectionOverrideAttr
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.scopes.*
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.*
-import org.jetbrains.kotlin.fir.typeContext
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.AbstractTypeChecker
@@ -94,15 +91,15 @@ class FirTypeIntersectionScope private constructor(
             members.map { MemberWithBaseScope(it, scope) }
         }
 
-        while (allMembersWithScope.isNotEmpty()) {
+        while (allMembersWithScope.size > 1) {
             val maxByVisibility = findMemberWithMaxVisibility(allMembersWithScope)
             val extractBothWaysWithPrivate = extractBothWaysOverridable(maxByVisibility, allMembersWithScope)
-            val extractedOverrides = extractBothWaysWithPrivate.filterNot {
+            val extractedOverrides = extractBothWaysWithPrivate.filterNotTo(mutableListOf()) {
                 Visibilities.isPrivate((it.member.fir as FirMemberDeclaration).visibility)
             }.takeIf { it.isNotEmpty() } ?: extractBothWaysWithPrivate
-
+            val baseMembersForIntersection = extractedOverrides.calcBaseMembersForIntersectionOverride()
-            val (mostSpecific, scopeForMostSpecific) = selectMostSpecificMember(extractedOverrides)
+            if (baseMembersForIntersection.size > 1) {
-            if (extractedOverrides.size > 1) {
+                val (mostSpecific, scopeForMostSpecific) = selectMostSpecificMember(baseMembersForIntersection)
                 val intersectionOverride = intersectionOverrides.getOrPut(mostSpecific) {
                     val newModality = chooseIntersectionOverrideModality(extractedOverrides)
                     val newVisibility = chooseIntersectionVisibility(extractedOverrides)
@@ -124,14 +121,64 @@ class FirTypeIntersectionScope private constructor(
                 @Suppress("UNCHECKED_CAST")
                 processor(intersectionOverride.member as D)
             } else {
+                val mostSpecific = baseMembersForIntersection.single().member
                 overriddenSymbols[mostSpecific] = extractedOverrides
                 processor(mostSpecific)
             }
         }
 
+        if (allMembersWithScope.isNotEmpty()) {
+            val single = allMembersWithScope.single().member
+            overriddenSymbols[single] = allMembersWithScope.toList()
+            processor(single)
+        }
+
         return true
     }
 
+    private inline fun <reified D : FirCallableDeclaration<*>> D.unwrapSubstitutionOverrides(): D {
+        var current = this
+
+        do {
+            val next = current.originalForSubstitutionOverride ?: return current
+            current = next
+        } while (true)
+    }
+
+    private fun <S : FirCallableSymbol<*>>
+            MutableList<MemberWithBaseScope<S>>.calcBaseMembersForIntersectionOverride(): List<MemberWithBaseScope<S>> {
+        if (size == 1) return this
+        val unwrappedMemberSet = mutableSetOf<MemberWithBaseScope<S>>()
+        for ((member, scope) in this) {
+            @Suppress("UNCHECKED_CAST")
+            unwrappedMemberSet += MemberWithBaseScope(member.fir.unwrapSubstitutionOverrides().symbol as S, scope)
+        }
+        // If in fact extracted overrides are the same symbols,
+        // we should just take most specific member without creating intersection
+        // A typical sample here is inheritance of the same class in different places of hierarchy
+        if (unwrappedMemberSet.size == 1) {
+            return listOf(selectMostSpecificMember(this))
+        }
+
+        val baseMembers = mutableSetOf<S>()
+        for ((unwrappedMember, scope) in unwrappedMemberSet) {
+            @Suppress("UNCHECKED_CAST")
+            if (unwrappedMember is FirNamedFunctionSymbol) {
+                scope.processOverriddenFunctions(unwrappedMember) {
+                    baseMembers += it.fir.unwrapSubstitutionOverrides().symbol as S
+                    ProcessorAction.NEXT
+                }
+            } else if (unwrappedMember is FirPropertySymbol) {
+                scope.processOverriddenProperties(unwrappedMember) {
+                    baseMembers += it.fir.unwrapSubstitutionOverrides().symbol as S
+                    ProcessorAction.NEXT
+                }
+            }
+        }
+        removeIf { (member, _) -> member.fir.unwrapSubstitutionOverrides().symbol in baseMembers }
+        return this
+    }
+
     private fun <D : FirCallableSymbol<*>> chooseIntersectionOverrideModality(
         extractedOverridden: Collection<MemberWithBaseScope<D>>
     ): Modality? {
@@ -397,7 +444,7 @@ class FirTypeIntersectionScope private constructor(
     private fun <D : FirCallableSymbol<*>> extractBothWaysOverridable(
         overrider: MemberWithBaseScope<D>,
         members: MutableCollection<MemberWithBaseScope<D>>
-    ): Collection<MemberWithBaseScope<D>> {
+    ): MutableList<MemberWithBaseScope<D>> {
         val result = mutableListOf<MemberWithBaseScope<D>>().apply { add(overrider) }
 
         val iterator = members.iterator()

compiler/testData/ir/irText/classes/enumClassModality.fir.txt

@@ -485,19 +485,19 @@ FILE fqName:<root> fileName:/enumClassModality.kt
             public abstract fun foo (): kotlin.Unit [fake_override] declared in <root>.TestAbstractEnum2
           $this: VALUE_PARAMETER name:<this> type:<root>.TestAbstractEnum2.X1
           BLOCK_BODY
-        FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+        FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
           overridden:
             public final fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.TestAbstractEnum2
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
           VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Int [fake_override]
           overridden:
             public final fun hashCode (): kotlin.Int [fake_override] declared in <root>.TestAbstractEnum2
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
-        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.String [fake_override]
           overridden:
             public open fun toString (): kotlin.String [fake_override] declared in <root>.TestAbstractEnum2
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
         FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Any [fake_override]
           overridden:
             protected final fun clone (): kotlin.Any [fake_override] declared in <root>.TestAbstractEnum2
@@ -528,22 +528,19 @@ FILE fqName:<root> fileName:/enumClassModality.kt
       overridden:
         public abstract fun foo (): kotlin.Unit declared in <root>.IFoo
       $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.IFoo
         public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.IFoo
         public final fun hashCode (): kotlin.Int declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String [fake_override] declared in <root>.IFoo
         public open fun toString (): kotlin.String declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
     FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Any [fake_override]
       overridden:
         protected final fun clone (): kotlin.Any declared in kotlin.Enum

compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.txt

@@ -88,17 +88,16 @@ FILE fqName:<root> fileName:/inlineCollectionOfInlineClass.kt
         correspondingProperty: PROPERTY name:size visibility:public modality:FINAL [val]
         overridden:
           public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Set
-          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Collection
-          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet
         $this: VALUE_PARAMETER name:<this> type:<root>.InlineMutableSet
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-size> (): kotlin.Int declared in <root>.InlineMutableSet'
-            CALL 'public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Int origin=GET_PROPERTY
+            CALL 'public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Set' type=kotlin.Int origin=GET_PROPERTY
               $this: CALL 'private final fun <get-ms> (): kotlin.collections.MutableSet<<root>.IT> declared in <root>.InlineMutableSet' type=kotlin.collections.MutableSet<<root>.IT> origin=GET_PROPERTY
                 $this: GET_VAR '<this>: <root>.InlineMutableSet declared in <root>.InlineMutableSet.<get-size>' type=<root>.InlineMutableSet origin=null
     FUN name:contains visibility:public modality:FINAL <> ($this:<root>.InlineMutableSet, element:<root>.IT) returnType:kotlin.Boolean [operator]
       overridden:
         public abstract fun contains (element: E of kotlin.collections.MutableSet): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableSet
+        public abstract fun contains (element: E of kotlin.collections.Set): kotlin.Boolean [operator] declared in kotlin.collections.Set
       $this: VALUE_PARAMETER name:<this> type:<root>.InlineMutableSet
       VALUE_PARAMETER name:element index:0 type:<root>.IT
       BLOCK_BODY
@@ -110,6 +109,7 @@ FILE fqName:<root> fileName:/inlineCollectionOfInlineClass.kt
     FUN name:containsAll visibility:public modality:FINAL <> ($this:<root>.InlineMutableSet, elements:kotlin.collections.Collection<<root>.IT>) returnType:kotlin.Boolean
       overridden:
         public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.MutableSet>): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet
+        public abstract fun containsAll (elements: kotlin.collections.Collection<E of kotlin.collections.Set>): kotlin.Boolean declared in kotlin.collections.Set
       $this: VALUE_PARAMETER name:<this> type:<root>.InlineMutableSet
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.IT>
       BLOCK_BODY
@@ -121,12 +121,10 @@ FILE fqName:<root> fileName:/inlineCollectionOfInlineClass.kt
     FUN name:isEmpty visibility:public modality:FINAL <> ($this:<root>.InlineMutableSet) returnType:kotlin.Boolean
       overridden:
         public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Set
-        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Collection
-        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet
       $this: VALUE_PARAMETER name:<this> type:<root>.InlineMutableSet
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun isEmpty (): kotlin.Boolean declared in <root>.InlineMutableSet'
-          CALL 'public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Boolean origin=null
+          CALL 'public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Set' type=kotlin.Boolean origin=null
             $this: CALL 'private final fun <get-ms> (): kotlin.collections.MutableSet<<root>.IT> declared in <root>.InlineMutableSet' type=kotlin.collections.MutableSet<<root>.IT> origin=GET_PROPERTY
               $this: GET_VAR '<this>: <root>.InlineMutableSet declared in <root>.InlineMutableSet.isEmpty' type=<root>.InlineMutableSet origin=null
     FUN name:add visibility:public modality:FINAL <> ($this:<root>.InlineMutableSet, element:<root>.IT) returnType:kotlin.Boolean

compiler/testData/ir/irText/expressions/kt30020.fir.txt

@@ -218,7 +218,7 @@ FILE fqName:<root> fileName:/kt30020.kt
       VALUE_PARAMETER name:element index:0 type:kotlin.Int
     FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
       overridden:
-        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableList
+        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.List
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
     FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableCollection<E of kotlin.collections.MutableCollection>) returnType:kotlin.collections.MutableIterator<kotlin.Int> [fake_override,operator]
       overridden:
@@ -233,7 +233,7 @@ FILE fqName:<root> fileName:/kt30020.kt
       FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val]
         overridden:
-          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableList
+          public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List
         $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:

compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt

@@ -23,26 +23,27 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
       FUN name:<get-entries> visibility:public modality:FINAL <> ($this:<root>.MyMap<K of <root>.MyMap, V of <root>.MyMap>) returnType:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K of <root>.MyMap, V of <root>.MyMap>>
         correspondingProperty: PROPERTY name:entries visibility:public modality:FINAL [val]
         overridden:
-          public abstract fun <get-entries> (): kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K of kotlin.collections.AbstractMutableMap, V of kotlin.collections.AbstractMutableMap>> [fake_override] declared in kotlin.collections.AbstractMutableMap
+          public abstract fun <get-entries> (): @[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] kotlin.collections.Map.Entry<@[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?, @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>?>? [fake_override] declared in kotlin.collections.AbstractMutableMap
+          public abstract fun <get-entries> (): @[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] kotlin.collections.Map.Entry<@[FlexibleNullability] K of java.util.AbstractMap?, @[FlexibleNullability] V of java.util.AbstractMap?>?>? declared in java.util.AbstractMap
         $this: VALUE_PARAMETER name:<this> type:<root>.MyMap<K of <root>.MyMap, V of <root>.MyMap>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-entries> (): kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K of <root>.MyMap, V of <root>.MyMap>> declared in <root>.MyMap'
             CALL 'public final fun mutableSetOf <T> (): kotlin.collections.MutableSet<T of kotlin.collections.SetsKt.mutableSetOf> [inline] declared in kotlin.collections.SetsKt' type=kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K of <root>.MyMap, V of <root>.MyMap>> origin=null
               <T>: kotlin.collections.MutableMap.MutableEntry<K of <root>.MyMap, V of <root>.MyMap>
-    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>) returnType:kotlin.Unit [fake_override]
+    FUN FAKE_OVERRIDE name:clear visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:kotlin.Unit [fake_override]
       overridden:
         public open fun clear (): kotlin.Unit [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-    FUN FAKE_OVERRIDE name:putAll visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>, from:kotlin.collections.Map<out K of <root>.MyMap, V of <root>.MyMap>) returnType:kotlin.Unit [fake_override]
+    FUN FAKE_OVERRIDE name:putAll visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:@[EnhancedNullability] kotlin.collections.Map<out @[FlexibleNullability] K of <root>.MyMap?, out @[FlexibleNullability] V of <root>.MyMap?>) returnType:kotlin.Unit [fake_override]
       overridden:
-        public open fun putAll (from: kotlin.collections.Map<out K of kotlin.collections.AbstractMutableMap, V of kotlin.collections.AbstractMutableMap>): kotlin.Unit [fake_override] declared in kotlin.collections.AbstractMutableMap
+        public open fun putAll (p0: @[EnhancedNullability] kotlin.collections.Map<out @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?, out @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>): kotlin.Unit [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:from index:0 type:kotlin.collections.Map<out K of <root>.MyMap, V of <root>.MyMap>
+      VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] kotlin.collections.Map<out @[FlexibleNullability] K of <root>.MyMap?, out @[FlexibleNullability] V of <root>.MyMap?>
-    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>, key:K of <root>.MyMap) returnType:V of <root>.MyMap? [fake_override]
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:@[FlexibleNullability] K of <root>.MyMap?) returnType:V of <root>.MyMap? [fake_override]
       overridden:
-        public open fun remove (key: K of kotlin.collections.AbstractMutableMap): V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap
+        public open fun remove (p0: @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?): V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] K of <root>.MyMap?
     FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>, key:K of <root>.MyMap, value:V of <root>.MyMap) returnType:kotlin.Boolean [fake_override]
       annotations:
         SinceKotlin(version = '1.1')
@@ -53,17 +54,17 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
       VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
       VALUE_PARAMETER name:value index:1 type:V of <root>.MyMap
     PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
-      FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>) returnType:kotlin.collections.MutableSet<K of <root>.MyMap> [fake_override]
+      FUN FAKE_OVERRIDE name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:@[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] K of <root>.MyMap?>? [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val]
         overridden:
-          public open fun <get-keys> (): kotlin.collections.MutableSet<K of kotlin.collections.AbstractMutableMap> [fake_override] declared in kotlin.collections.AbstractMutableMap
+          public open fun <get-keys> (): @[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?>? [fake_override] declared in kotlin.collections.AbstractMutableMap
-        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
+        $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
     PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
-      FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>) returnType:kotlin.collections.MutableCollection<V of <root>.MyMap> [fake_override]
+      FUN FAKE_OVERRIDE name:<get-values> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:@[FlexibleNullability] kotlin.collections.Collection<@[FlexibleNullability] V of <root>.MyMap?>? [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val]
         overridden:
-          public open fun <get-values> (): kotlin.collections.MutableCollection<V of kotlin.collections.AbstractMutableMap> [fake_override] declared in kotlin.collections.AbstractMutableMap
+          public open fun <get-values> (): @[FlexibleNullability] kotlin.collections.Collection<@[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>? [fake_override] declared in kotlin.collections.AbstractMutableMap
-        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
+        $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
     FUN FAKE_OVERRIDE name:replaceAll visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>, p0:@[EnhancedNullability] java.util.function.BiFunction<in @[FlexibleNullability] K of <root>.MyMap?, in @[FlexibleNullability] V of <root>.MyMap?, out @[FlexibleNullability] V of <root>.MyMap?>) returnType:kotlin.Unit [fake_override]
       overridden:
         public open fun replaceAll (p0: @[EnhancedNullability] java.util.function.BiFunction<in @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?, in @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?, out @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>): kotlin.Unit [fake_override] declared in kotlin.collections.AbstractMutableMap
@@ -113,21 +114,21 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableMap<K of kotlin.collections.MutableMap, V of kotlin.collections.MutableMap>
       VALUE_PARAMETER name:p0 index:0 type:K of <root>.MyMap
       VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.BiFunction<in @[FlexibleNullability] K of <root>.MyMap?, in @[FlexibleNullability] V of <root>.MyMap?, out @[FlexibleNullability] V of <root>.MyMap?>
-    FUN FAKE_OVERRIDE name:containsKey visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, key:K of <root>.MyMap) returnType:kotlin.Boolean [fake_override]
+    FUN FAKE_OVERRIDE name:containsKey visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:@[FlexibleNullability] K of <root>.MyMap?) returnType:kotlin.Boolean [fake_override]
       overridden:
-        public open fun containsKey (key: K of kotlin.collections.AbstractMutableMap): kotlin.Boolean [fake_override] declared in kotlin.collections.AbstractMutableMap
+        public open fun containsKey (p0: @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?): kotlin.Boolean [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] K of <root>.MyMap?
-    FUN FAKE_OVERRIDE name:containsValue visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, value:V of <root>.MyMap) returnType:kotlin.Boolean [fake_override]
+    FUN FAKE_OVERRIDE name:containsValue visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:@[FlexibleNullability] V of <root>.MyMap?) returnType:kotlin.Boolean [fake_override]
       overridden:
-        public open fun containsValue (value: V of kotlin.collections.AbstractMutableMap): kotlin.Boolean [fake_override] declared in kotlin.collections.AbstractMutableMap
+        public open fun containsValue (p0: @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?): kotlin.Boolean [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:value index:0 type:V of <root>.MyMap
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] V of <root>.MyMap?
-    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, key:K of <root>.MyMap) returnType:V of <root>.MyMap? [fake_override,operator]
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:@[FlexibleNullability] K of <root>.MyMap?) returnType:V of <root>.MyMap? [fake_override,operator]
       overridden:
-        public open fun get (key: K of kotlin.collections.AbstractMutableMap): V of kotlin.collections.AbstractMutableMap? [fake_override,operator] declared in kotlin.collections.AbstractMutableMap
+        public open fun get (p0: @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?): V of kotlin.collections.AbstractMutableMap? [fake_override,operator] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] K of <root>.MyMap?
     FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, key:K of <root>.MyMap, defaultValue:V of <root>.MyMap) returnType:V of <root>.MyMap [fake_override]
       annotations:
         SinceKotlin(version = '1.1')
@@ -137,34 +138,34 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
       VALUE_PARAMETER name:key index:0 type:K of <root>.MyMap
       VALUE_PARAMETER name:defaultValue index:1 type:V of <root>.MyMap
-    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>) returnType:kotlin.Boolean [fake_override]
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public open fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
     PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
-      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>) returnType:kotlin.Int [fake_override]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:kotlin.Int [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
         overridden:
           public open fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.AbstractMutableMap
-        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
+        $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
     FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>, p0:@[EnhancedNullability] java.util.function.BiConsumer<in @[FlexibleNullability] K of <root>.MyMap?, in @[FlexibleNullability] V of <root>.MyMap?>) returnType:kotlin.Unit [fake_override]
       overridden:
         public open fun forEach (p0: @[EnhancedNullability] java.util.function.BiConsumer<in @[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?, in @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>): kotlin.Unit [fake_override] declared in kotlin.collections.AbstractMutableMap
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of kotlin.collections.Map, V of kotlin.collections.Map>
       VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] java.util.function.BiConsumer<in @[FlexibleNullability] K of <root>.MyMap?, in @[FlexibleNullability] V of <root>.MyMap?>
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>, p0:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.AbstractMutableMap
+        public open fun equals (p0: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:@[EnhancedNullability] kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String [fake_override] declared in kotlin.collections.AbstractMutableMap
+        public open fun toString (): @[EnhancedNullability] kotlin.String [fake_override] declared in kotlin.collections.AbstractMutableMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>
     FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:java.util.AbstractMap<K of java.util.AbstractMap, V of java.util.AbstractMap>) returnType:@[FlexibleNullability] kotlin.Any? [fake_override]
       overridden:
         protected/*protected and package*/ open fun clone (): @[FlexibleNullability] kotlin.Any? [fake_override] declared in kotlin.collections.AbstractMutableMap

compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.txt

@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.Foo.A; <root>.Foo.B]'
     FUN DELEGATED_MEMBER name:add visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean
       overridden:
-        public abstract fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun add (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
       BLOCK_BODY
@@ -19,7 +19,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.add' type=@[FlexibleNullability] kotlin.String? origin=null
     FUN DELEGATED_MEMBER name:addAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
       overridden:
-        public abstract fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun addAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
       BLOCK_BODY
@@ -39,7 +39,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.clear' type=<root>.Impl origin=null
     FUN DELEGATED_MEMBER name:iterator visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [operator]
       overridden:
-        public abstract fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [fake_override,operator] declared in <root>.Foo.A
+        public abstract fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [fake_override,operator] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun iterator (): kotlin.collections.MutableIterator<@[FlexibleNullability] kotlin.String?> [operator] declared in <root>.Impl'
@@ -48,7 +48,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
               receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.iterator' type=<root>.Impl origin=null
     FUN DELEGATED_MEMBER name:remove visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean
       overridden:
-        public abstract fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun remove (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
       BLOCK_BODY
@@ -59,7 +59,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.remove' type=@[FlexibleNullability] kotlin.String? origin=null
     FUN DELEGATED_MEMBER name:removeAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
       overridden:
-        public abstract fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun removeAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
       BLOCK_BODY
@@ -70,7 +70,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.removeAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
     FUN DELEGATED_MEMBER name:retainAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
       overridden:
-        public abstract fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun retainAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
       BLOCK_BODY
@@ -81,7 +81,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in <root>.Impl.retainAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null
     FUN DELEGATED_MEMBER name:contains visibility:public modality:OPEN <> ($this:<root>.Impl, element:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Boolean [operator]
       overridden:
-        public abstract fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.A
+        public abstract fun contains (element: @[FlexibleNullability] kotlin.String?): kotlin.Boolean [fake_override,operator] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:element index:0 type:@[FlexibleNullability] kotlin.String?
       BLOCK_BODY
@@ -92,7 +92,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
             element: GET_VAR 'element: @[FlexibleNullability] kotlin.String? declared in <root>.Impl.contains' type=@[FlexibleNullability] kotlin.String? origin=null
     FUN DELEGATED_MEMBER name:containsAll visibility:public modality:OPEN <> ($this:<root>.Impl, elements:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.Boolean
       overridden:
-        public abstract fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.A
+        public abstract fun containsAll (elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>): kotlin.Boolean [fake_override] declared in <root>.Foo.B
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?>
       BLOCK_BODY
@@ -108,7 +108,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.Impl
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun isEmpty (): kotlin.Boolean declared in <root>.Impl'
-          CALL 'public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Boolean origin=null
+          CALL 'public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Set' type=kotlin.Boolean origin=null
             $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
               receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.isEmpty' type=<root>.Impl origin=null
     PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
@@ -120,7 +120,7 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.Impl
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public open fun <get-size> (): kotlin.Int declared in <root>.Impl'
-            CALL 'public abstract fun <get-size> (): kotlin.Int [fake_override] declared in kotlin.collections.MutableSet' type=kotlin.Int origin=null
+            CALL 'public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.Set' type=kotlin.Int origin=null
               $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
                 receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.<get-size>' type=<root>.Impl origin=null
     FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]

compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.txt

@@ -152,7 +152,6 @@ FILE fqName:<root> fileName:/ImplicitReceiverStack.kt
     FUN name:iterator visibility:public modality:FINAL <> ($this:<root>.PersistentImplicitReceiverStack) returnType:kotlin.collections.Iterator<<root>.ImplicitReceiverValue<*>> [operator]
       overridden:
         public abstract fun iterator (): kotlin.collections.Iterator<<root>.ImplicitReceiverValue<*>> [fake_override,operator] declared in <root>.ImplicitReceiverStack
-        public abstract fun iterator (): kotlin.collections.Iterator<T of kotlin.collections.Iterable> [operator] declared in kotlin.collections.Iterable
       $this: VALUE_PARAMETER name:<this> type:<root>.PersistentImplicitReceiverStack
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun iterator (): kotlin.collections.Iterator<<root>.ImplicitReceiverValue<*>> [operator] declared in <root>.PersistentImplicitReceiverStack'
@@ -173,13 +172,11 @@ FILE fqName:<root> fileName:/ImplicitReceiverStack.kt
     FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<T of kotlin.collections.Iterable>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.ImplicitReceiverValue<*>?>?) returnType:kotlin.Unit [fake_override]
       overridden:
         public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.ImplicitReceiverValue<*>?>?): kotlin.Unit [fake_override] declared in <root>.ImplicitReceiverStack
-        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] T of kotlin.collections.Iterable?>?): kotlin.Unit declared in kotlin.collections.Iterable
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<T of kotlin.collections.Iterable>
       VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.ImplicitReceiverValue<*>?>?
     FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<T of kotlin.collections.Iterable>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.ImplicitReceiverValue<*>?> [fake_override]
       overridden:
         public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.ImplicitReceiverValue<*>?> [fake_override] declared in <root>.ImplicitReceiverStack
-        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] T of kotlin.collections.Iterable?> declared in kotlin.collections.Iterable
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<T of kotlin.collections.Iterable>
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:

compiler/testData/ir/irText/firProblems/MultiList.fir.txt

@@ -194,108 +194,91 @@ FILE fqName:<root> fileName:/MultiList.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in java.util.ArrayList'
           <E>: <root>.Some<T of <root>.SomeList>
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SomeList modality:OPEN visibility:public superTypes:[<root>.MyList<T of <root>.SomeList>; java.util.ArrayList<<root>.Some<T of <root>.SomeList>>]'
-    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public abstract fun contains (element: <root>.Some<T of <root>.MyList>): kotlin.Boolean [fake_override,operator] declared in <root>.MyList
         public open fun contains (p0: @[FlexibleNullability] E of java.util.ArrayList?): kotlin.Boolean [operator] declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?
     FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, elements:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public abstract fun containsAll (elements: kotlin.collections.Collection<<root>.Some<T of <root>.MyList>>): kotlin.Boolean [fake_override] declared in <root>.MyList
         public open fun containsAll (p0: kotlin.collections.Collection<@[FlexibleNullability] E of java.util.ArrayList?>): kotlin.Boolean [fake_override] declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>
-    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:<root>.Some<T of <root>.SomeList> [fake_override,operator]
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>? [fake_override,operator]
       overridden:
-        public abstract fun get (index: kotlin.Int): <root>.Some<T of <root>.MyList> [fake_override,operator] declared in <root>.MyList
         public open fun get (p0: kotlin.Int): @[FlexibleNullability] E of java.util.ArrayList? [operator] declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?) returnType:kotlin.Int [fake_override]
       overridden:
-        public abstract fun indexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
         public open fun indexOf (p0: @[FlexibleNullability] E of java.util.ArrayList?): kotlin.Int declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?
-    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Boolean [fake_override]
       overridden:
-        public abstract fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.MyList
         public open fun isEmpty (): kotlin.Boolean declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
     FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] kotlin.collections.MutableIterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override,operator]
       overridden:
-        public abstract fun iterator (): kotlin.collections.Iterator<<root>.Some<T of <root>.MyList>> [fake_override,operator] declared in <root>.MyList
         public open fun iterator (): @[EnhancedNullability] kotlin.collections.MutableIterator<@[FlexibleNullability] E of java.util.ArrayList?> [operator] declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<T of <root>.SomeList>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?) returnType:kotlin.Int [fake_override]
       overridden:
-        public abstract fun lastIndexOf (element: <root>.Some<T of <root>.MyList>): kotlin.Int [fake_override] declared in <root>.MyList
         public open fun lastIndexOf (p0: @[FlexibleNullability] E of java.util.ArrayList?): kotlin.Int declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<T of <root>.SomeList>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?
     FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
-        public abstract fun listIterator (): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
         public open fun listIterator (): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
     FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
-        public abstract fun listIterator (index: kotlin.Int): kotlin.collections.ListIterator<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
         public open fun listIterator (p0: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
       VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
     FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int, p1:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableList<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
-        public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.List<<root>.Some<T of <root>.MyList>> [fake_override] declared in <root>.MyList
         public open fun subList (p0: kotlin.Int, p1: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableList<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
       VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
       VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
     PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
-      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Int [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
         overridden:
-          public abstract fun <get-size> (): kotlin.Int [fake_override] declared in <root>.MyList
           public open fun <get-size> (): kotlin.Int declared in java.util.ArrayList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+        $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<E of kotlin.collections.Collection>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
-        public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.MyList>?> [fake_override] declared in <root>.MyList
         public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<E of kotlin.collections.Collection>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
     FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<E of kotlin.collections.Collection>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
         public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.MyList>?> [fake_override] declared in <root>.MyList
-        public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] E of java.util.ArrayList?> [fake_override] declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<E of kotlin.collections.Collection>
     FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<E of kotlin.collections.Collection>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override]
       overridden:
         public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.MyList>?> [fake_override] declared in <root>.MyList
-        public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] E of java.util.ArrayList?> [fake_override] declared in java.util.ArrayList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<E of kotlin.collections.Collection>
-    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<T of kotlin.collections.Iterable>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?) returnType:kotlin.Unit [fake_override]
       overridden:
-        public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.MyList>?>?): kotlin.Unit [fake_override] declared in <root>.MyList
         public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] E of java.util.ArrayList?>?): kotlin.Unit declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<T of kotlin.collections.Iterable>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
       VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:java.util.AbstractList<E of java.util.AbstractList>, p0:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.MyList
         public open fun equals (p0: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractList<E of java.util.AbstractList>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:java.util.AbstractList<E of java.util.AbstractList>) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.MyList
         public open fun hashCode (): kotlin.Int [fake_override] declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractList<E of java.util.AbstractList>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:java.util.AbstractCollection<E of java.util.AbstractCollection>) returnType:@[EnhancedNullability] kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String [fake_override] declared in <root>.MyList
         public open fun toString (): @[EnhancedNullability] kotlin.String [fake_override] declared in java.util.ArrayList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractCollection<E of java.util.AbstractCollection>
     FUN FAKE_OVERRIDE name:elementData visibility:public/*package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] <root>.Some<T of <root>.SomeList>? [fake_override]
       overridden:
         public/*package*/ open fun elementData (p0: kotlin.Int): @[FlexibleNullability] E of java.util.ArrayList? declared in java.util.ArrayList
@@ -404,39 +387,39 @@ FILE fqName:<root> fileName:/MultiList.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.SomeList'
           <T>: kotlin.String
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FinalList modality:FINAL visibility:public superTypes:[<root>.SomeList<kotlin.String>]'
-    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<kotlin.String>?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public open fun contains (element: <root>.Some<T of <root>.SomeList>): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
+        public open fun contains (p0: @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<kotlin.String>?
     FUN FAKE_OVERRIDE name:containsAll visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, elements:kotlin.collections.Collection<<root>.Some<kotlin.String>>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public open fun containsAll (elements: kotlin.collections.Collection<<root>.Some<T of <root>.SomeList>>): kotlin.Boolean [fake_override] declared in <root>.SomeList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
       VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<<root>.Some<kotlin.String>>
-    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, index:kotlin.Int) returnType:<root>.Some<kotlin.String> [fake_override,operator]
+    FUN FAKE_OVERRIDE name:get visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] <root>.Some<kotlin.String>? [fake_override,operator]
       overridden:
-        public open fun get (index: kotlin.Int): <root>.Some<T of <root>.SomeList> [fake_override,operator] declared in <root>.SomeList
+        public open fun get (p0: kotlin.Int): @[FlexibleNullability] <root>.Some<T of <root>.SomeList>? [fake_override,operator] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:index index:0 type:kotlin.Int
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<kotlin.String>?) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun indexOf (element: <root>.Some<T of <root>.SomeList>): kotlin.Int [fake_override] declared in <root>.SomeList
+        public open fun indexOf (p0: @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?): kotlin.Int [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<kotlin.String>?
-    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Boolean [fake_override]
+    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public open fun isEmpty (): kotlin.Boolean [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
     FUN FAKE_OVERRIDE name:iterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] kotlin.collections.MutableIterator<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override,operator]
       overridden:
         public open fun iterator (): @[EnhancedNullability] kotlin.collections.MutableIterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override,operator] declared in <root>.SomeList
       $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>, element:<root>.Some<kotlin.String>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] <root>.Some<kotlin.String>?) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun lastIndexOf (element: <root>.Some<T of <root>.SomeList>): kotlin.Int [fake_override] declared in <root>.SomeList
+        public open fun lastIndexOf (p0: @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?): kotlin.Int [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-      VALUE_PARAMETER name:element index:0 type:<root>.Some<kotlin.String>
+      VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] <root>.Some<kotlin.String>?
     FUN FAKE_OVERRIDE name:listIterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override]
       overridden:
         public open fun listIterator (): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override] declared in <root>.SomeList
@@ -453,15 +436,15 @@ FILE fqName:<root> fileName:/MultiList.kt
       VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
       VALUE_PARAMETER name:p1 index:1 type:kotlin.Int
     PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
-      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:kotlin.collections.List<E of kotlin.collections.List>) returnType:kotlin.Int [fake_override]
+      FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:kotlin.Int [fake_override]
         correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
         overridden:
           public open fun <get-size> (): kotlin.Int [fake_override] declared in <root>.SomeList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.collections.List<E of kotlin.collections.List>
+        $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
-    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<E of kotlin.collections.Collection>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override]
+    FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>) returnType:@[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override]
       overridden:
         public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<E of kotlin.collections.Collection>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
     FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<E of kotlin.collections.Collection>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<kotlin.String>?> [fake_override]
       overridden:
         public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override] declared in <root>.SomeList
@@ -470,24 +453,24 @@ FILE fqName:<root> fileName:/MultiList.kt
       overridden:
         public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] <root>.Some<T of <root>.SomeList>?> [fake_override] declared in <root>.SomeList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<E of kotlin.collections.Collection>
-    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<T of kotlin.collections.Iterable>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
+    FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?) returnType:kotlin.Unit [fake_override]
       overridden:
         public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<T of <root>.SomeList>?>?): kotlin.Unit [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Iterable<T of kotlin.collections.Iterable>
+      $this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<E of java.util.ArrayList>
       VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer<in @[FlexibleNullability] <root>.Some<kotlin.String>?>?
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:java.util.AbstractList<E of java.util.AbstractList>, p0:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
+        public open fun equals (p0: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractList<E of java.util.AbstractList>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      VALUE_PARAMETER name:p0 index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:java.util.AbstractList<E of java.util.AbstractList>) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractList<E of java.util.AbstractList>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:java.util.AbstractCollection<E of java.util.AbstractCollection>) returnType:@[EnhancedNullability] kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String [fake_override] declared in <root>.SomeList
+        public open fun toString (): @[EnhancedNullability] kotlin.String [fake_override] declared in <root>.SomeList
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:java.util.AbstractCollection<E of java.util.AbstractCollection>
     FUN FAKE_OVERRIDE name:elementData visibility:public/*package*/ modality:OPEN <> ($this:java.util.ArrayList<E of java.util.ArrayList>, p0:kotlin.Int) returnType:@[FlexibleNullability] <root>.Some<kotlin.String>? [fake_override]
       overridden:
         public/*package*/ open fun elementData (p0: kotlin.Int): @[FlexibleNullability] <root>.Some<T of <root>.SomeList>? [fake_override] declared in <root>.SomeList

idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt

@@ -289,7 +289,7 @@ KtFirFunctionSymbol:
   isSuspend: false
   modality: ABSTRACT
   name: contains
-  origin: INTERSECTION_OVERRIDE
+  origin: LIBRARY
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
@@ -310,7 +310,7 @@ KtFirFunctionSymbol:
   isSuspend: false
   modality: ABSTRACT
   name: containsAll
-  origin: INTERSECTION_OVERRIDE
+  origin: LIBRARY
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
@@ -363,8 +363,8 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty
+  callableIdIfNonLocal: kotlin/collections/List.isEmpty
-  dispatchType: kotlin/collections/MutableList<E>
+  dispatchType: kotlin/collections/List<E>
   isExtension: false
   isExternal: false
   isInline: false
@@ -373,7 +373,7 @@ KtFirFunctionSymbol:
   isSuspend: false
   modality: ABSTRACT
   name: isEmpty
-  origin: INTERSECTION_OVERRIDE
+  origin: LIBRARY
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
@@ -427,10 +427,10 @@ KtFirKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/List.size
-  dispatchType: kotlin/collections/MutableList<E>
+  dispatchType: kotlin/collections/List<E>
-  getter: null
+  getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: false
-  hasGetter: false
+  hasGetter: true
   hasSetter: false
   initializer: null
   isConst: false
@@ -440,7 +440,7 @@ KtFirKotlinPropertySymbol:
   isVal: true
   modality: ABSTRACT
   name: size
-  origin: INTERSECTION_OVERRIDE
+  origin: LIBRARY
   receiverType: null
   setter: null
   symbolKind: MEMBER