[FIR] Set status.isOverride for fake overrides

Even though SO may not be correct
overrides sometimes, it feels more
natural to treat fake overrides as...
well, "overrides". And without it
we'd need to make the code in
`FirOverrideChecker` less intuitive.

compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt

@@ -4,7 +4,7 @@ C:
 
 D:
   [Java(Source)]: public open field x: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
     [Source]: public abstract val x: R|kotlin/Int| from Use site scope of /A [id: 1]
     [Source]: public abstract val x: R|kotlin/String| from Use site scope of /B [id: 2]
   [Java(Source)]: private open field y: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
@@ -14,7 +14,7 @@ D:
   [Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /D [id: 0]
 
 E:
-  [IntersectionOverride]: public abstract val x: R|kotlin/Int| from Java enhancement scope for /E [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Int| from Java enhancement scope for /E [id: 0]
     [Source]: public abstract val x: R|kotlin/Int| from Use site scope of /A [id: 1]
     [Source]: public abstract val x: R|kotlin/String| from Use site scope of /B [id: 2]
   [Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /E [id: 0]

compiler/fir/analysis-tests/testData/resolve/scopes/intersectionOverrideOfTwoMembers.overrides.txt

@@ -1,18 +1,18 @@
 C:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /B [id: 2]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /B [id: 2]
 
 D:
   [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /D [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
   [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /D [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /B [id: 3]
 

compiler/fir/analysis-tests/testData/resolve/scopes/intersectionOverrideOfTwoMembers_java.overrides.txt

@@ -1,17 +1,17 @@
 C:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /B [id: 2]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /B [id: 2]
 
 D:
   [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /D [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
   [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /D [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /B [id: 3]

compiler/fir/analysis-tests/testData/resolve/scopes/noIntersectionOverrideOfTwoMembers.overrides.txt

@@ -1,36 +1,36 @@
 C:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 2]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 2]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
 
 Explicit:
   [Source]: public abstract override fun foo(): R|kotlin/Int| from Use site scope of /Explicit [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /D [id: 4]
   [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /Explicit [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /D [id: 4]
 
 Implicit:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /Implicit [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Int| from Use site scope of /Implicit [id: 0]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /D [id: 4]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /Implicit [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /Implicit [id: 0]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]

compiler/fir/analysis-tests/testData/resolve/scopes/noIntersectionOverrideOfTwoMembers_java.overrides.txt

@@ -1,36 +1,36 @@
 C:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 2]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 1]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 0]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 0]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
     [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 2]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 1]
 
 Explicit:
   [Source]: public abstract override fun foo(): R|kotlin/Int| from Use site scope of /Explicit [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /D [id: 4]
   [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /Explicit [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /D [id: 4]
 
 Implicit:
-  [IntersectionOverride]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /Implicit [id: 0]
-    [IntersectionOverride]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
+  [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Int| from Use site scope of /Implicit [id: 0]
+    [IntersectionOverride]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override fun foo(): R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract fun foo(): R|kotlin/Any| from Use site scope of /A [id: 2]
     [Source]: public abstract fun foo(): R|kotlin/Int| from Use site scope of /D [id: 4]
-  [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /Implicit [id: 0]
-    [IntersectionOverride]: public abstract val x: R|kotlin/Any| from Use site scope of /C [id: 1]
+  [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /Implicit [id: 0]
+    [IntersectionOverride]: public abstract override val x: R|kotlin/Any| from Use site scope of /C [id: 1]
       [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]
       [Source]: public abstract override val x: R|kotlin/Any| from Use site scope of /B [id: 3]
         [Source]: public abstract val x: R|kotlin/Any| from Use site scope of /A [id: 2]

compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt

@@ -3,7 +3,7 @@ C:
     [Enhancement]: public abstract fun getName(): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
       [Enhancement]: public abstract fun getName(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
   [Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Use site scope of /C [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
       [Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
   [Source]: private final var name: R|kotlin/String| from Use site scope of /C [id: 0]
 
@@ -14,7 +14,7 @@ D:
         [Enhancement]: public abstract fun getName(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
   [Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Java enhancement scope for /D [id: 0]
     [Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Use site scope of /C [id: 0]
-      [SubstitutionOverride(DeclarationSite)]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
+      [SubstitutionOverride(DeclarationSite)]: public abstract override fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
         [Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
   [Source]: private final var name: R|kotlin/String| from Java enhancement scope for /D [id: 0]
     [Source]: private final var name: R|kotlin/String| from Use site scope of /C [id: 0]

compiler/fir/analysis-tests/testData/resolve/scopes/singleIntersectionOverride.overrides.txt

@@ -2,10 +2,10 @@ D:
   [IntersectionOverride]: public abstract override fun foo(): R|E4| from Use site scope of /D [id: 0]
     [SubstitutionOverride(DeclarationSite)]: public abstract override fun foo(): R|E4| from Substitution scope for [Use site scope of /B] for type D<E4> [id: 1]
       [Source]: public abstract override fun foo(): R|E2| from Use site scope of /B [id: 2]
-        [SubstitutionOverride(DeclarationSite)]: public abstract fun foo(): R|E2| from Substitution scope for [Use site scope of /A] for type B<E2> [id: 3]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override fun foo(): R|E2| from Substitution scope for [Use site scope of /A] for type B<E2> [id: 3]
           [Source]: public abstract fun foo(): R|E1| from Use site scope of /A [id: 4]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun foo(): R|E4| from Substitution scope for [Use site scope of /C] for type D<E4> [id: 5]
-      [SubstitutionOverride(DeclarationSite)]: public abstract fun foo(): R|E3| from Use site scope of /C [id: 6]
-        [SubstitutionOverride(DeclarationSite)]: public abstract fun foo(): R|E3| from Substitution scope for [Use site scope of /A] for type C<E3> [id: 6]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun foo(): R|E4| from Substitution scope for [Use site scope of /C] for type D<E4> [id: 5]
+      [SubstitutionOverride(DeclarationSite)]: public abstract override fun foo(): R|E3| from Use site scope of /C [id: 6]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override fun foo(): R|E3| from Substitution scope for [Use site scope of /A] for type C<E3> [id: 6]
           [Source]: public abstract fun foo(): R|E1| from Use site scope of /A [id: 4]
 

compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_1.overrides.txt

@@ -3,11 +3,11 @@ Some:
     [Library]: public abstract fun toByte(): R|kotlin/Byte| from Use site scope of kotlin/Number [id: 1]
     [RenamedForOverride]: public abstract fun toByte(): R|kotlin/Byte| from Java enhancement scope for /MyNumber [id: 2]
       [Enhancement]: public abstract fun byteValue(): R|kotlin/Byte| from Java enhancement scope for /MyBaseNumber [id: 3]
-  [IntersectionOverride]: public abstract fun toShort(): R|kotlin/Short| from Java enhancement scope for /Some [id: 0]
+  [IntersectionOverride]: public abstract override fun toShort(): R|kotlin/Short| from Java enhancement scope for /Some [id: 0]
     [Library]: public abstract fun toShort(): R|kotlin/Short| from Use site scope of kotlin/Number [id: 1]
     [RenamedForOverride]: public abstract fun toShort(): R|kotlin/Short| from Java enhancement scope for /MyNumber [id: 2]
       [Enhancement]: public abstract fun shortValue(): R|kotlin/Short| from Java enhancement scope for /MyBaseNumber [id: 3]
-  [IntersectionOverride]: public abstract fun toInt(): R|kotlin/Int| from Java enhancement scope for /Some [id: 0]
+  [IntersectionOverride]: public abstract override fun toInt(): R|kotlin/Int| from Java enhancement scope for /Some [id: 0]
     [Library]: public abstract fun toInt(): R|kotlin/Int| from Use site scope of kotlin/Number [id: 1]
     [RenamedForOverride]: public abstract fun toInt(): R|kotlin/Int| from Java enhancement scope for /MyNumber [id: 2]
   [Library]: public abstract fun toLong(): R|kotlin/Long| from Java enhancement scope for /Some [id: 0]

compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt

@@ -1,37 +1,37 @@
 SomeMap:
   [Enhancement]: public abstract fun containsKey(key: R|ft<K3 & Any, K3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|ft<K3 & Any, K3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
-      [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
-        [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|ft<K3 & Any, K3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
+      [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|K|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
           [Library]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
       [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
-        [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
           [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
-  [IntersectionOverride]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
-      [SubstitutionOverride(DeclarationSite)]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
-        [SubstitutionOverride(DeclarationSite)]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
+  [IntersectionOverride]: public abstract override fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
+      [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsValue(value: R|V|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
           [Library]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
       [Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
-  [IntersectionOverride]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Java enhancement scope for /SomeMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
-      [SubstitutionOverride(DeclarationSite)]: public abstract operator fun get(key: R|K|): R|V?| from Use site scope of kotlin/collections/MutableMap [id: 2]
-        [SubstitutionOverride(DeclarationSite)]: public abstract operator fun get(key: R|K|): R|V?| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
+  [IntersectionOverride]: public abstract override operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Java enhancement scope for /SomeMap [id: 0]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
+      [SubstitutionOverride(DeclarationSite)]: public abstract override operator fun get(key: R|K|): R|V?| from Use site scope of kotlin/collections/MutableMap [id: 2]
+        [SubstitutionOverride(DeclarationSite)]: public abstract override operator fun get(key: R|K|): R|V?| from Substitution scope for [Use site scope of kotlin/collections/Map] for type kotlin/collections/MutableMap<K, V> [id: 2]
           [Library]: public abstract operator fun get(key: R|K|): R|V?| from Use site scope of kotlin/collections/Map [id: 3]
-    [SubstitutionOverride(DeclarationSite)]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|ft<V3 & Any, V3?>| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override operator fun get(key: R|ft<K3 & Any, K3?>|): R|ft<V3 & Any, V3?>| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
       [Enhancement]: public abstract operator fun get(key: R|ft<K2 & Any, K2?>|): R|ft<V2 & Any, V2?>| from Java enhancement scope for /MyMap [id: 5]
   [Enhancement]: public abstract fun remove(key: R|ft<K3 & Any, K3?>|): R|V3?| from Java enhancement scope for /SomeMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun remove(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun remove(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
       [Library]: public abstract fun remove(key: R|K|): R|V?| from Use site scope of kotlin/collections/MutableMap [id: 2]
-  [SubstitutionOverride(DeclarationSite)]: public open fun remove(key: R|ft<K3 & Any, K3?>|, value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public open fun remove(key: R|ft<K3 & Any, K3?>|, value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 0]
+  [SubstitutionOverride(DeclarationSite)]: public open override fun remove(key: R|ft<K3 & Any, K3?>|, value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
+    [SubstitutionOverride(DeclarationSite)]: public open override fun remove(key: R|ft<K3 & Any, K3?>|, value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 0]
       [Library]: public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 1]
 
 MyMap:
   [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
-    [SubstitutionOverride(DeclarationSite)]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
+    [SubstitutionOverride(DeclarationSite)]: public abstract override fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
       [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 2]
   [Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
   [Enhancement]: public abstract operator fun get(key: R|ft<K2 & Any, K2?>|): R|ft<V2 & Any, V2?>| from Java enhancement scope for /MyMap [id: 0]