K2/Java: implement platform-dependent function filtering in JvmMappedScope

We drop Kotlin function 'remove' or 'getOrDefault' from JvmMappedScope,
if it has platform-dependent annotation, and the bound Java class scope
does not contain a function with the same signature.

#KT-57268 Fixed

compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.kt

@@ -1,3 +1,4 @@
+// FULL_JDK
 // SCOPE_DUMP: SomeMap:containsKey;containsValue;get;remove, MyMap:containsKey;containsValue;get
 
 // FILE: MyBaseMap.java

compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.kt

@@ -1,4 +1,6 @@
+// FULL_JDK
+
 fun test(map: java.util.AbstractMap<String, Int>) {
     map.remove("", null)
     map.remove(null)
-}
+}

compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/FirJvmPlatformDeclarationFilter.kt

@@ -7,34 +7,28 @@ package org.jetbrains.kotlin.fir.scopes.jvm
 
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.containingClassLookupTag
 import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.declarations.hasAnnotation
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
+import org.jetbrains.kotlin.fir.scopes.FirTypeScope
-import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
+import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.fir.scopes.platformClassMapper
-import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
-import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 
 internal object FirJvmPlatformDeclarationFilter {
-    fun isFunctionAvailable(function: FirSimpleFunction, session: FirSession): Boolean {
+    fun isFunctionAvailable(function: FirSimpleFunction, javaClassScope: FirTypeScope, session: FirSession): Boolean {
         // Optimization: only run the below logic for functions named "getOrDefault" and "remove", since only two functions with these names
         // in kotlin.collections.Map are currently annotated with @PlatformDependent.
-        if (function.name.asString() != "getOrDefault" && function.name.asString() != "remove") return true
+        if (function.name !in namesToCheck) return true
-
-        val javaAnalogueClassId =
-            session.platformClassMapper.getCorrespondingPlatformClass(function.containingClassLookupTag()?.classId) ?: return true
 
         if (!function.hasAnnotation(StandardNames.FqNames.platformDependentClassId, session)) return true
 
-        val javaAnalogue = session.symbolProvider.getClassLikeSymbolByClassId(javaAnalogueClassId) as? FirClassSymbol<*> ?: return true
-        val scope = javaAnalogue.unsubstitutedScope(session, ScopeSession(), withForcedTypeCalculator = false, null)
         var isFunctionPresentInJavaAnalogue = false
-        scope.processFunctionsByName(function.name) {
+        val jvmDescriptorOfKotlinFunction = function.computeJvmDescriptor()
-            if (it.fir.computeJvmDescriptor() == function.computeJvmDescriptor()) {
+        javaClassScope.processFunctionsByName(function.name) { javaAnalogueFunctionSymbol ->
+            if (javaAnalogueFunctionSymbol.fir.computeJvmDescriptor() == jvmDescriptorOfKotlinFunction) {
                 isFunctionPresentInJavaAnalogue = true
             }
         }
         return isFunctionPresentInJavaAnalogue
     }
+
+    private val namesToCheck = listOf("getOrDefault", "remove").map(Name::identifier)
 }

compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt

@@ -97,8 +97,10 @@ class JvmMappedScope(
     override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
         val declared = mutableListOf<FirNamedFunctionSymbol>()
         declaredMemberScope.processFunctionsByName(name) { symbol ->
-            declared += symbol
+            if (FirJvmPlatformDeclarationFilter.isFunctionAvailable(symbol.fir, javaMappedClassUseSiteScope, session)) {
-            processor(symbol)
+                declared += symbol
+                processor(symbol)
+            }
         }
 
         val declaredSignatures: Set<String> by lazy {

compiler/testData/codegen/box/builtinStubMethods/Map.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS MyMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/builtinStubMethods/Map.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 class MyMap<K, V>: Map<K, V> {
     override val size: Int get() = 0

compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS MyMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 class MyMap<K, V>: Map<K, V> {
     override val size: Int get() = 0

compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.jvm_abi.txt

@@ -1,18 +0,0 @@
-MODULE main
-	CLASS A.class
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Integer;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Integer;Ljava/lang/String;)Z [public, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]

compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 import java.util.AbstractMap
 import java.util.Collections

compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.jvm_abi.txt

@@ -1,18 +0,0 @@
-MODULE main
-	CLASS A.class
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;D)Ljava/lang/Double; [public, final, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/String;D)Ljava/lang/Double; [public, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/String;Ljava/lang/Double;)Z [public, bridge]

compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt

@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTION_INHERITANCE
 // KJS_WITH_FULL_RUNTIME
 // DONT_TARGET_EXACT_BACKEND: NATIVE
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 class A : HashMap<String, Double>()
 

compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63955, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63955, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS M.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 // WITH_STDLIB
 
 abstract class Itr : Iterator<String>

compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63955, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63955, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63955, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.jvm_abi.txt

@@ -93,10 +93,6 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
 	CLASS MM.class
 		CLASS METADATA
 			K1

compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt

@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268
+// JVM_ABI_K1_K2_DIFF: KT-63955, KT-63828
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/collections/kt41123.jvm_abi.txt

@@ -1,18 +0,0 @@
-MODULE main
-	CLASS A.class
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/String;Ljava/lang/String;)Z [public, bridge]

compiler/testData/codegen/box/collections/kt41123.kt

@@ -2,7 +2,6 @@
 // DONT_TARGET_EXACT_BACKEND: NATIVE
 // WASM_MUTE_REASON: STDLIB_COLLECTION_INHERITANCE
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 open class A : HashMap<String, String>()
 

compiler/testData/codegen/box/collections/readOnlyMap.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS KMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/collections/readOnlyMap.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 // FILE: J.java
 

compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS MapA.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 // FILE: removeOverriddenInJava_Map.kt
 

compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.jvm_abi.txt

@@ -1,15 +0,0 @@
-MODULE main
-	CLASS SuspendingMutableMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
-	CLASS MapSuspendAbstractClearKt$box$1$map$1.class
-		K1
-			---
-		K2
-			getOrDefault(II)Ljava/lang/Integer; [public, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;I)Ljava/lang/Integer; [public, final, bridge]

compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.kt

@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 import kotlin.coroutines.*
 

compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS SuspendingMutableMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.kt

@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 import kotlin.coroutines.*
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.jvm_abi.txt

@@ -33,7 +33,3 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt

@@ -1,7 +1,7 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63828
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class FieldValue(val value: String)

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.jvm_abi.txt

@@ -33,7 +33,3 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.kt

@@ -1,7 +1,7 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63828
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class FieldValue<T: String>(val value: T)

compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.jvm_abi.txt

@@ -1,10 +0,0 @@
-MODULE main
-	CLASS ZArrayMap.class
-		K1
-			---
-		K2
-			getOrDefault-SjU93Dg([III)I [public, static]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.kt

@@ -1,7 +1,6 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class Z(val x: Int)

compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.jvm_abi.txt

@@ -1,10 +0,0 @@
-MODULE main
-	CLASS ZArrayMap.class
-		K1
-			---
-		K2
-			getOrDefault-SjU93Dg([III)I [public, static]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.kt

@@ -1,7 +1,6 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class Z<T: Int>(val x: T)

compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMutableCollectionBulkAdd.jvm_abi.txt

@@ -43,11 +43,3 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			getOrDefault-impl(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [public, static]
-		K1
-			---
-		K2
-			remove-impl(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Z [public, static]

compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.jvm_abi.txt

@@ -33,7 +33,3 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt

@@ -1,7 +1,7 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63828
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class Wrapper(val id: Int)

compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.jvm_abi.txt

@@ -33,7 +33,3 @@ MODULE main
 				---
 			K2
 				values
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.kt

@@ -1,7 +1,7 @@
 // WITH_STDLIB
 // WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-// JVM_ABI_K1_K2_DIFF: KT-57268, KT-63828
+// JVM_ABI_K1_K2_DIFF: KT-63828
 
 OPTIONAL_JVM_INLINE_ANNOTATION
 value class Wrapper<T: Int>(val id: T)

compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS test/A.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.kt

@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM
 // WITH_REFLECT
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 package test
 

compiler/testData/codegen/box/specialBuiltins/emptyMap.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS EmptyMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/specialBuiltins/emptyMap.kt

@@ -1,5 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-57268
-
 private object EmptyMap : Map<Any, Nothing> {
     override val size: Int get() = 0
     override fun isEmpty(): Boolean = true

compiler/testData/codegen/box/specialBuiltins/emptyStringMap.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS EmptyStringMap.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt

@@ -1,5 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-57268
-
 private object EmptyStringMap : Map<String, Nothing> {
     override val size: Int get() = 0
     override fun isEmpty(): Boolean = true

compiler/testData/codegen/box/specialBuiltins/entrySetSOE.jvm_abi.txt

@@ -1,18 +0,0 @@
-MODULE main
-	CLASS Map1.class
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [public, final, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; [public, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge]
-		K1
-			---
-		K2
-			remove(Ljava/lang/String;Ljava/lang/Object;)Z [public, bridge]

compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt

@@ -2,7 +2,6 @@
 // WASM_MUTE_REASON: STDLIB_COLLECTION_INHERITANCE
 // KJS_WITH_FULL_RUNTIME
 // DONT_TARGET_EXACT_BACKEND: NATIVE
-// JVM_ABI_K1_K2_DIFF: KT-57268
 
 open class Map1 : HashMap<String, Any?>()
 class Map2 : Map1()

compiler/testData/codegen/box/specialBuiltins/maps.jvm_abi.txt

@@ -1,6 +0,0 @@
-MODULE main
-	CLASS A.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]

compiler/testData/codegen/box/specialBuiltins/maps.kt

@@ -1,5 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-57268
-
 class A : Map<String, String> {
     override val size: Int get() = 56
 

compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.jvm_abi.txt

@@ -1,24 +0,0 @@
-MODULE main
-	CLASS AbstractFoo.class
-		K1
-			---
-		K2
-			remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public]
-	CLASS StringFoo.class
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [public, final, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; [public, bridge]
-	CLASS IntFoo.class
-		K1
-			---
-		K2
-			getOrDefault(ILjava/lang/Object;)Ljava/lang/Object; [public, bridge]
-		K1
-			---
-		K2
-			getOrDefault(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [public, final, bridge]

compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt

@@ -1,5 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-57268
-
 var result = ""
 
 public abstract class AbstractFoo<K, V> : Map<K, V> {

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.kt

@@ -1,6 +1,3 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class ByteShortMap : Map<Byte, Short>

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.kt

@@ -1,6 +1,3 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class GenericMap<K, V> : Map<K, V>

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.kt

@@ -1,6 +1,3 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class GenericStringMap<K> : Map<K, String>

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.kt

@@ -1,6 +1,3 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class NumberStringMap : Map<Number, String>

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.kt

@@ -1,8 +1,5 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class GenericMap<K, V> : Map<K, V>
 
 abstract class NumberStringMap : GenericMap<Number, String>()

compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.kt

@@ -1,6 +1,3 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 abstract class StringGenericMap<V> : Map<String, V>

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.jvm_abi.txt

@@ -0,0 +1,103 @@
+MODULE main
+	CLASS DGenericCollection.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DGenericSet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DGenericList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DGenericMap.class
+		CLASS METADATA
+			K1
+				---
+			K2
+				entries
+			K1
+				getEntries()Ljava/util/Set;
+			K2
+				---
+			K1
+				getKeys()Ljava/util/Set;
+			K2
+				---
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				getValues()Ljava/util/Collection;
+			K2
+				---
+			K1
+				---
+			K2
+				keys
+			K1
+				---
+			K2
+				size
+			K1
+				---
+			K2
+				values
+	CLASS DGenericMapEntry.class
+		CLASS METADATA
+			K1
+				getKey()Ljava/lang/Object;
+			K2
+				---
+			K1
+				getValue()Ljava/lang/Object;
+			K2
+				---
+			K1
+				---
+			K2
+				key
+			K1
+				---
+			K2
+				value
+	CLASS DGenericCollectionBySet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DGenericCollectionByList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.kt

@@ -1,5 +1,4 @@
-// IGNORE_BACKEND_K2: JVM_IR
+// JVM_ABI_K1_K2_DIFF: KT-65323
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
 
 class DGenericIterator<T>(d: Iterator<T>) : Iterator<T> by d
 

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.jvm_abi.txt

@@ -0,0 +1,103 @@
+MODULE main
+	CLASS DStringCollection.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DStringSet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DStringList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DStringMap.class
+		CLASS METADATA
+			K1
+				---
+			K2
+				entries
+			K1
+				getEntries()Ljava/util/Set;
+			K2
+				---
+			K1
+				getKeys()Ljava/util/Set;
+			K2
+				---
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				getValues()Ljava/util/Collection;
+			K2
+				---
+			K1
+				---
+			K2
+				keys
+			K1
+				---
+			K2
+				size
+			K1
+				---
+			K2
+				values
+	CLASS DStringMapEntry.class
+		CLASS METADATA
+			K1
+				getKey()Ljava/lang/String;
+			K2
+				---
+			K1
+				getValue()Ljava/lang/Number;
+			K2
+				---
+			K1
+				---
+			K2
+				key
+			K1
+				---
+			K2
+				value
+	CLASS DStringCollectionBySet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DStringCollectionByList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.kt

@@ -1,5 +1,4 @@
-// IGNORE_BACKEND_K2: JVM_IR
+// JVM_ABI_K1_K2_DIFF: KT-65323
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
 
 class DStringIterator(d: Iterator<String>) : Iterator<String> by d
 

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.jvm_abi.txt

@@ -0,0 +1,103 @@
+MODULE main
+	CLASS DIntCollection.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DIntSet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DIntList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DIntMap.class
+		CLASS METADATA
+			K1
+				---
+			K2
+				entries
+			K1
+				getEntries()Ljava/util/Set;
+			K2
+				---
+			K1
+				getKeys()Ljava/util/Set;
+			K2
+				---
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				getValues()Ljava/util/Collection;
+			K2
+				---
+			K1
+				---
+			K2
+				keys
+			K1
+				---
+			K2
+				size
+			K1
+				---
+			K2
+				values
+	CLASS DIntMapEntry.class
+		CLASS METADATA
+			K1
+				getKey()Ljava/lang/Integer;
+			K2
+				---
+			K1
+				getValue()Ljava/lang/Double;
+			K2
+				---
+			K1
+				---
+			K2
+				key
+			K1
+				---
+			K2
+				value
+	CLASS DIntCollectionBySet.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size
+	CLASS DIntCollectionByList.class
+		CLASS METADATA
+			K1
+				getSize()I
+			K2
+				---
+			K1
+				---
+			K2
+				size

compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.kt

@@ -1,5 +1,4 @@
-// IGNORE_BACKEND_K2: JVM_IR
+// JVM_ABI_K1_K2_DIFF: KT-65323
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
 
 class DIntIterator(d: Iterator<Int>) : Iterator<Int> by d
 

compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt

@@ -1,9 +1,7 @@
 // WITH_STDLIB
 
 // IGNORE_BACKEND_K2: JVM_IR
-// FIR status:
+// FIR status: KT-57300 K2: subclass of MutableCollection with primitive element type has methods with boxed type
-//   1) KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-//   2) KT-57300 K2: subclass of MutableCollection with primitive element type has methods with boxed type
 //      (`containsValue(Ljava/lang/Double;)Z` instead of `containsValue(D)Z`)
 
 abstract class AMapSD : AbstractMap<String, Double>()

compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.jvm_abi.txt

@@ -0,0 +1,9 @@
+MODULE main
+	CLASS MyMap.class
+		CLASS METADATA
+			PROPERTY getValues()Ljava/util/ArrayList;
+				Property: class.metadata.property.returnType
+					K1
+						java/util/ArrayList<T#1> /* = kotlin/collections/ArrayList^<T#1> */
+					K2
+						java/util/ArrayList<T#1>

compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt

@@ -1,9 +1,8 @@
+// JVM_ABI_K1_K2_DIFF: KT-63864
+
 // Ensure the proper collection stubs are added, in
 // particular *not* when specialized implementations are provided.
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 class MyMap<K, V> : Map<K, V> {
 
     class MySet<E> : Set<E> {

compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt

@@ -1,8 +1,5 @@
 // See KT-42033
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 interface ObservableMap<K, V> : Map<K, V>
 
 abstract class ObservableMutableMap<K, V> : ObservableMap<K, V> {

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.kt

@@ -1,9 +1,5 @@
 // IGNORE_ANNOTATIONS
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-// (in this case, it's `getOrDefault-impl` because of inline class mangling, and then `remove` is unmangled for some reason)
-
 inline class InlineMap<K, V>(private val map: Map<K, V>) : Map<K, V> {
     override val entries: Set<Map.Entry<K, V>> get() = map.entries
     override val keys: Set<K> get() = map.keys

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.kt

@@ -1,9 +1,5 @@
 // IGNORE_ANNOTATIONS
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-// (in this case, it's `remove-impl`/`getOrDefault-impl` because of inline class mangling)
-
 inline class InlineMutableMap<K, V>(private val mmap: MutableMap<K, V>) : MutableMap<K, V> {
     override val size: Int get() = mmap.size
     override fun containsKey(key: K): Boolean = mmap.containsKey(key)

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.kt

@@ -1,9 +1,5 @@
 // IGNORE_ANNOTATIONS
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-// (in this case, it's `getOrDefault-h8vw2VU` because of inline class mangling, and then `remove` is unmangled for some reason)
-
 inline class IK(val x: Int)
 inline class IV(val x: Double)
 

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.kt

@@ -1,9 +1,5 @@
 // IGNORE_ANNOTATIONS
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-// (in this case, it's `remove-YEowaJk`/`getOrDefault-h8vw2VU` because of inline class mangling)
-
 inline class IK(val x: Int)
 inline class IV(val x: Double)
 

compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.kt

@@ -1,8 +1,5 @@
 // WITH_STDLIB
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 open class A : HashMap<String, String>()
 
 class B : A()

compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.kt

@@ -1,8 +1,5 @@
 // WITH_SIGNATURES
 
-// IGNORE_BACKEND_K2: JVM_IR
-// FIR status: KT-57268 K2: extra methods `remove` and/or `getOrDefault` are generated for Map subclasses with JDK 1.6 in dependencies
-
 interface MapN<K : Number, V> : Map<K, V>
 
 abstract class MapImpl<A, B> : Map<A, B> {

compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt

@@ -12,4 +12,4 @@ public expect abstract class AbstractMutableMap<K, V> : MutableMap<K, V> {
 
 import java.util.AbstractMap
 
-public actual abstract class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>AbstractMutableMap<!><K, V>() : MutableMap<K, V>, AbstractMap<K, V>()
+public actual abstract class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS, NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>AbstractMutableMap<!><K, V>() : MutableMap<K, V>, AbstractMap<K, V>()

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

@@ -85,12 +85,3 @@ FILE fqName:<root> fileName:/internalStdlibOverride.kt
         overridden:
           public open fun <get-values> (): kotlin.collections.Collection<V of kotlin.collections.AbstractMap> declared in kotlin.collections.AbstractMap
         $this: VALUE_PARAMETER name:<this> type:kotlin.collections.AbstractMap<kotlin.Int, kotlin.Int>
-    FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map<kotlin.Int, kotlin.Int>, key:kotlin.Int, defaultValue:kotlin.Int) returnType:kotlin.Int [fake_override]
-      annotations:
-        SinceKotlin(version = "1.1")
-        PlatformDependent
-      overridden:
-        public open fun getOrDefault (key: K of kotlin.collections.AbstractMap, defaultValue: V of kotlin.collections.AbstractMap): V of kotlin.collections.AbstractMap declared in kotlin.collections.AbstractMap
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<kotlin.Int, kotlin.Int>
-      VALUE_PARAMETER name:key index:0 type:kotlin.Int
-      VALUE_PARAMETER name:defaultValue index:1 type:kotlin.Int

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

@@ -113,15 +113,6 @@ FILE fqName:<root> fileName:/kt43342.kt
             CALL 'public abstract fun <get-values> (): kotlin.collections.Collection<V of kotlin.collections.Map> declared in kotlin.collections.Map' type=kotlin.collections.Collection<V of <root>.ControlFlowInfo> origin=null
               $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
                 receiver: GET_VAR '<this>: <root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> declared in <root>.ControlFlowInfo.<get-values>' type=<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
-    FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>, key:K of <root>.ControlFlowInfo, defaultValue:V of <root>.ControlFlowInfo) returnType:V of <root>.ControlFlowInfo [fake_override]
-      annotations:
-        SinceKotlin(version = "1.1")
-        PlatformDependent
-      overridden:
-        public open fun getOrDefault (key: K of kotlin.collections.Map, defaultValue: V of kotlin.collections.Map): V of kotlin.collections.Map declared in kotlin.collections.Map
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>
-      VALUE_PARAMETER name:key index:0 type:K of <root>.ControlFlowInfo
-      VALUE_PARAMETER name:defaultValue index:1 type:V of <root>.ControlFlowInfo
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.collections.Map
@@ -178,15 +169,6 @@ FILE fqName:<root> fileName:/kt43342.kt
         public open fun get (key: K of <root>.ControlFlowInfo): V of <root>.ControlFlowInfo? declared in <root>.ControlFlowInfo
       $this: VALUE_PARAMETER name:<this> type:<root>.ControlFlowInfo<kotlin.String, kotlin.String>
       VALUE_PARAMETER name:key index:0 type:kotlin.String
-    FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map<kotlin.String, kotlin.String>, key:kotlin.String, defaultValue:kotlin.String) returnType:kotlin.String [fake_override]
-      annotations:
-        SinceKotlin(version = "1.1")
-        PlatformDependent
-      overridden:
-        public open fun getOrDefault (key: K of <root>.ControlFlowInfo, defaultValue: V of <root>.ControlFlowInfo): V of <root>.ControlFlowInfo declared in <root>.ControlFlowInfo
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Map<kotlin.String, kotlin.String>
-      VALUE_PARAMETER name:key index:0 type:kotlin.String
-      VALUE_PARAMETER name:defaultValue index:1 type:kotlin.String
     FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:OPEN <> ($this:<root>.ControlFlowInfo<kotlin.String, kotlin.String>) returnType:kotlin.Boolean [fake_override]
       overridden:
         public open fun isEmpty (): kotlin.Boolean declared in <root>.ControlFlowInfo

compiler/testData/ir/irText/firProblems/kt43342.kt

@@ -2,7 +2,6 @@
 // IGNORE_BACKEND_K1: JS_IR, JS_IR_ES6
 // ^ Map has js specific methods
 // IGNORE_BACKEND_K2: JS_IR
-// IGNORE_BACKEND_K2: NATIVE
 
 open class ControlFlowInfo<K, V>(val map: Map<K, V>): Map<K, V> by map