diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.kt b/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.kt index 3639d39a382..71aac31db04 100644 --- a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.kt +++ b/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 diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.kt index 1a52e06de36..b738bd284b8 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.kt @@ -1,4 +1,6 @@ +// FULL_JDK + fun test(map: java.util.AbstractMap) { map.remove("", null) map.remove(null) -} \ No newline at end of file +} diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/FirJvmPlatformDeclarationFilter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/FirJvmPlatformDeclarationFilter.kt index a9fe9e234e0..12e47e82292 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/FirJvmPlatformDeclarationFilter.kt +++ b/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.resolve.providers.symbolProvider -import org.jetbrains.kotlin.fir.scopes.platformClassMapper -import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope -import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol +import org.jetbrains.kotlin.fir.scopes.FirTypeScope +import org.jetbrains.kotlin.name.Name 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 - - val javaAnalogueClassId = - session.platformClassMapper.getCorrespondingPlatformClass(function.containingClassLookupTag()?.classId) ?: return true + if (function.name !in namesToCheck) 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) { - if (it.fir.computeJvmDescriptor() == function.computeJvmDescriptor()) { + val jvmDescriptorOfKotlinFunction = 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) } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt index 9a2fbc6523d..a364e227b4e 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt +++ b/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() declaredMemberScope.processFunctionsByName(name) { symbol -> - declared += symbol - processor(symbol) + if (FirJvmPlatformDeclarationFilter.isFunctionAvailable(symbol.fir, javaMappedClassUseSiteScope, session)) { + declared += symbol + processor(symbol) + } } val declaredSignatures: Set by lazy { diff --git a/compiler/testData/codegen/box/builtinStubMethods/Map.jvm_abi.txt b/compiler/testData/codegen/box/builtinStubMethods/Map.jvm_abi.txt deleted file mode 100644 index 09e2362803f..00000000000 --- a/compiler/testData/codegen/box/builtinStubMethods/Map.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS MyMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/builtinStubMethods/Map.kt b/compiler/testData/codegen/box/builtinStubMethods/Map.kt index 6b4d6431e26..c0324984796 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/Map.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/Map.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// JVM_ABI_K1_K2_DIFF: KT-57268 class MyMap: Map { override val size: Int get() = 0 diff --git a/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.jvm_abi.txt b/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.jvm_abi.txt deleted file mode 100644 index 09e2362803f..00000000000 --- a/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS MyMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt b/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt index 807380e9f28..879e1f929e9 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// JVM_ABI_K1_K2_DIFF: KT-57268 class MyMap: Map { override val size: Int get() = 0 diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.jvm_abi.txt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.jvm_abi.txt deleted file mode 100644 index b99bb42c571..00000000000 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt index b9e71907c2e..c8bb76a50ba 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt +++ b/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 diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.jvm_abi.txt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.jvm_abi.txt deleted file mode 100644 index 376e41789e3..00000000000 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt index 981491d90a0..4a4ac18194d 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt +++ b/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() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt index 9f295d302f1..45acbfebf29 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt index f2cd3a99657..f14fbdca13a 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.jvm_abi.txt deleted file mode 100644 index b4e884f155c..00000000000 --- a/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS M.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.kt b/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.kt index 0eb635acb76..4b7952ccf08 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/mutabilityMarkerInterfaces.kt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt index 54bacf1fb3c..a797097bc87 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedAsWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt index 73492ea6ca4..90148d87268 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedIsWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt index 8a8db31fabb..bbe5f9dc730 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.jvm_abi.txt b/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.jvm_abi.txt index 98aa5a72250..96d7b5ae58c 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.jvm_abi.txt +++ b/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 diff --git a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt index 35d92480a8d..d824da1c954 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt +++ b/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 by ArrayList().iterator() class MItr : MutableIterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/collections/kt41123.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt41123.jvm_abi.txt deleted file mode 100644 index 8caa872c772..00000000000 --- a/compiler/testData/codegen/box/collections/kt41123.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/collections/kt41123.kt b/compiler/testData/codegen/box/collections/kt41123.kt index cf1ebc3a8d0..817a4ad992f 100644 --- a/compiler/testData/codegen/box/collections/kt41123.kt +++ b/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() diff --git a/compiler/testData/codegen/box/collections/readOnlyMap.jvm_abi.txt b/compiler/testData/codegen/box/collections/readOnlyMap.jvm_abi.txt deleted file mode 100644 index f7e3c803029..00000000000 --- a/compiler/testData/codegen/box/collections/readOnlyMap.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS KMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/collections/readOnlyMap.kt b/compiler/testData/codegen/box/collections/readOnlyMap.kt index 8165d4eb9ac..89fd8d60c90 100644 --- a/compiler/testData/codegen/box/collections/readOnlyMap.kt +++ b/compiler/testData/codegen/box/collections/readOnlyMap.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// JVM_ABI_K1_K2_DIFF: KT-57268 // FILE: J.java diff --git a/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.jvm_abi.txt b/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.jvm_abi.txt deleted file mode 100644 index d6a72d8e5b9..00000000000 --- a/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS MapA.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.kt b/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.kt index 1ebab6b2c11..18e9bc36d78 100644 --- a/compiler/testData/codegen/box/collections/removeOverriddenInJava_Map.kt +++ b/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 diff --git a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.jvm_abi.txt b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.jvm_abi.txt deleted file mode 100644 index c59be2d6f90..00000000000 --- a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.kt b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.kt index b98feb0ce07..7eb8f76eb71 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendAbstractClear.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// JVM_ABI_K1_K2_DIFF: KT-57268 import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.jvm_abi.txt b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.jvm_abi.txt deleted file mode 100644 index d6798471db5..00000000000 --- a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS SuspendingMutableMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.kt b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.kt index dba5c70d09c..dd673b4ba8e 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/mapSuspendClear.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// JVM_ABI_K1_K2_DIFF: KT-57268 import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.jvm_abi.txt index 97d25b59edb..70f665ba3e2 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.jvm_abi.txt +++ b/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] diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt index 108295eeab4..f468d33c0f8 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt +++ b/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) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.jvm_abi.txt index 97d25b59edb..70f665ba3e2 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.jvm_abi.txt +++ b/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] diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.kt index 2fef4468d46..61899c7c13e 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585Generic.kt +++ b/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(val value: T) diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.jvm_abi.txt deleted file mode 100644 index 75bedb84da7..00000000000 --- a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.kt index be15499dd34..03a388900ad 100644 --- a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClass.kt +++ b/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) diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.jvm_abi.txt deleted file mode 100644 index 75bedb84da7..00000000000 --- a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.kt index a65cc668df1..40b185120b1 100644 --- a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMapOfInlineClassGeneric.kt +++ b/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(val x: T) diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMutableCollectionBulkAdd.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMutableCollectionBulkAdd.jvm_abi.txt index 095a6910cce..ea40b8d9b67 100644 --- a/compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMutableCollectionBulkAdd.jvm_abi.txt +++ b/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] diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.jvm_abi.txt index fcc51d206df..5faa5f09477 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.jvm_abi.txt +++ b/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] diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt index 405452174bf..4e3dac96ac1 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337.kt +++ b/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) diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.jvm_abi.txt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.jvm_abi.txt index fcc51d206df..5faa5f09477 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.jvm_abi.txt +++ b/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] diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.kt b/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.kt index 7da6993337f..0991676d919 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceDelegation/kt38337Generic.kt +++ b/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(val id: T) diff --git a/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.jvm_abi.txt b/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.jvm_abi.txt deleted file mode 100644 index 67ecef89d12..00000000000 --- a/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS test/A.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.kt b/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.kt index 3ca649de6ff..caddfa2d311 100644 --- a/compiler/testData/codegen/box/reflection/mapping/types/allSupertypes.kt +++ b/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 diff --git a/compiler/testData/codegen/box/specialBuiltins/emptyMap.jvm_abi.txt b/compiler/testData/codegen/box/specialBuiltins/emptyMap.jvm_abi.txt deleted file mode 100644 index 8c7178170d9..00000000000 --- a/compiler/testData/codegen/box/specialBuiltins/emptyMap.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS EmptyMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/specialBuiltins/emptyMap.kt b/compiler/testData/codegen/box/specialBuiltins/emptyMap.kt index de2be9911f9..c0770bd6b2a 100644 --- a/compiler/testData/codegen/box/specialBuiltins/emptyMap.kt +++ b/compiler/testData/codegen/box/specialBuiltins/emptyMap.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-57268 - private object EmptyMap : Map { override val size: Int get() = 0 override fun isEmpty(): Boolean = true diff --git a/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.jvm_abi.txt b/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.jvm_abi.txt deleted file mode 100644 index 78c82bb20f4..00000000000 --- a/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS EmptyStringMap.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt b/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt index e93eb8c09b2..fd4953af8ec 100644 --- a/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt +++ b/compiler/testData/codegen/box/specialBuiltins/emptyStringMap.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-57268 - private object EmptyStringMap : Map { override val size: Int get() = 0 override fun isEmpty(): Boolean = true diff --git a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.jvm_abi.txt b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.jvm_abi.txt deleted file mode 100644 index d1c999845de..00000000000 --- a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt index 8f75d229a68..294ad219d43 100644 --- a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt +++ b/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() class Map2 : Map1() diff --git a/compiler/testData/codegen/box/specialBuiltins/maps.jvm_abi.txt b/compiler/testData/codegen/box/specialBuiltins/maps.jvm_abi.txt deleted file mode 100644 index 6935dc0dfa3..00000000000 --- a/compiler/testData/codegen/box/specialBuiltins/maps.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS A.class - K1 - --- - K2 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public] diff --git a/compiler/testData/codegen/box/specialBuiltins/maps.kt b/compiler/testData/codegen/box/specialBuiltins/maps.kt index eaecd627eef..d3dedeef878 100644 --- a/compiler/testData/codegen/box/specialBuiltins/maps.kt +++ b/compiler/testData/codegen/box/specialBuiltins/maps.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-57268 - class A : Map { override val size: Int get() = 56 diff --git a/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.jvm_abi.txt b/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.jvm_abi.txt deleted file mode 100644 index d6fc322265b..00000000000 --- a/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.jvm_abi.txt +++ /dev/null @@ -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] diff --git a/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt b/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt index 7b826353981..df49fe5a5cb 100644 --- a/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt +++ b/compiler/testData/codegen/box/specialBuiltins/noSpecialBridgeInSuperClass.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-57268 - var result = "" public abstract class AbstractFoo : Map { diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.kt index d9ccc6d70f8..1d3b2bf35cb 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.kt +++ b/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 diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.kt index a41cf0c88a7..d64e0be043b 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.kt +++ b/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 : Map diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.kt index 9c1099764f4..17e0263c891 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.kt +++ b/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 : Map diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.kt index 0d18ba3b7a8..1e9c9f09a31 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.kt +++ b/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 diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.kt index 653af2994ac..98d54f0c7fa 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.kt +++ b/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 : Map abstract class NumberStringMap : GenericMap() diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.kt index a7b6292ada7..466222bc908 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.kt +++ b/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 : Map diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.jvm_abi.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.jvm_abi.txt new file mode 100644 index 00000000000..4c0416bfde2 --- /dev/null +++ b/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 diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.kt index ee44c08c0bb..e4f70261fbc 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.kt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.kt @@ -1,5 +1,4 @@ -// 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 +// JVM_ABI_K1_K2_DIFF: KT-65323 class DGenericIterator(d: Iterator) : Iterator by d diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.jvm_abi.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.jvm_abi.txt new file mode 100644 index 00000000000..d0c57f582bf --- /dev/null +++ b/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 diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.kt index 1c6a0fdb414..caf468a400a 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.kt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.kt @@ -1,5 +1,4 @@ -// 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 +// JVM_ABI_K1_K2_DIFF: KT-65323 class DStringIterator(d: Iterator) : Iterator by d diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.jvm_abi.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.jvm_abi.txt new file mode 100644 index 00000000000..4d1458fcca2 --- /dev/null +++ b/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 diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.kt index 1643272862b..2ee4c7e8213 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.kt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.kt @@ -1,5 +1,4 @@ -// 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 +// JVM_ABI_K1_K2_DIFF: KT-65323 class DIntIterator(d: Iterator) : Iterator by d diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt index 518244e4c57..b3a642a23d2 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.kt @@ -1,9 +1,7 @@ // WITH_STDLIB // IGNORE_BACKEND_K2: JVM_IR -// FIR status: -// 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 +// FIR status: 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() diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.jvm_abi.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.jvm_abi.txt new file mode 100644 index 00000000000..d4b45c43432 --- /dev/null +++ b/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 /* = kotlin/collections/ArrayList^ */ + K2 + java/util/ArrayList diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt index 8c94d68b839..0995e697aa5 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt +++ b/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 : Map { class MySet : Set { diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt index 93ac78a1707..a485c47ba18 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt +++ b/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 : Map abstract class ObservableMutableMap : ObservableMap { diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.kt index d1ccba730d4..ccfd44b1ec5 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.kt +++ b/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(private val map: Map) : Map { override val entries: Set> get() = map.entries override val keys: Set get() = map.keys diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.kt index ba5a86f627e..b59350f0e38 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.kt +++ b/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(private val mmap: MutableMap) : MutableMap { override val size: Int get() = mmap.size override fun containsKey(key: K): Boolean = mmap.containsKey(key) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.kt index 3e0ece461eb..005e4e8bb2c 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.kt +++ b/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) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.kt index 319ea71c594..5d978e41a74 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.kt +++ b/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) diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.kt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.kt index 2f446f825b7..d2616bd1fd5 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.kt +++ b/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() class B : A() diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.kt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.kt index cd593436bbe..43d70b813a8 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.kt +++ b/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 : Map abstract class MapImpl : Map { diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt index 3a83499727c..edfc21b21c6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/implicitActualFakeOverride_AbstractMap.ll.kt @@ -12,4 +12,4 @@ public expect abstract class AbstractMutableMap : MutableMap { import java.util.AbstractMap -public actual abstract class AbstractMutableMap() : MutableMap, AbstractMap() +public actual abstract class AbstractMutableMap() : MutableMap, AbstractMap() diff --git a/compiler/testData/ir/irText/declarations/internalStdlibOverride.fir.ir.txt b/compiler/testData/ir/irText/declarations/internalStdlibOverride.fir.ir.txt index 1d73c3cd968..1e29392d6ee 100644 --- a/compiler/testData/ir/irText/declarations/internalStdlibOverride.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/internalStdlibOverride.fir.ir.txt @@ -85,12 +85,3 @@ FILE fqName: fileName:/internalStdlibOverride.kt overridden: public open fun (): kotlin.collections.Collection declared in kotlin.collections.AbstractMap $this: VALUE_PARAMETER name: type:kotlin.collections.AbstractMap - FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map, 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: type:kotlin.collections.Map - VALUE_PARAMETER name:key index:0 type:kotlin.Int - VALUE_PARAMETER name:defaultValue index:1 type:kotlin.Int diff --git a/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt b/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt index a11d7d14bd1..d8a25933ecb 100644 --- a/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt @@ -113,15 +113,6 @@ FILE fqName: fileName:/kt43342.kt CALL 'public abstract fun (): kotlin.collections.Collection declared in kotlin.collections.Map' type=kotlin.collections.Collection.ControlFlowInfo> origin=null $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> origin=null receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null - FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo>, key:K of .ControlFlowInfo, defaultValue:V of .ControlFlowInfo) returnType:V of .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: type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> - VALUE_PARAMETER name:key index:0 type:K of .ControlFlowInfo - VALUE_PARAMETER name:defaultValue index:1 type:V of .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: fileName:/kt43342.kt public open fun get (key: K of .ControlFlowInfo): V of .ControlFlowInfo? declared in .ControlFlowInfo $this: VALUE_PARAMETER name: type:.ControlFlowInfo VALUE_PARAMETER name:key index:0 type:kotlin.String - FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map, 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 .ControlFlowInfo, defaultValue: V of .ControlFlowInfo): V of .ControlFlowInfo declared in .ControlFlowInfo - $this: VALUE_PARAMETER name: type:kotlin.collections.Map - 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:.ControlFlowInfo) returnType:kotlin.Boolean [fake_override] overridden: public open fun isEmpty (): kotlin.Boolean declared in .ControlFlowInfo diff --git a/compiler/testData/ir/irText/firProblems/kt43342.kt b/compiler/testData/ir/irText/firProblems/kt43342.kt index 7b88d7dc009..158687b6f92 100644 --- a/compiler/testData/ir/irText/firProblems/kt43342.kt +++ b/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(val map: Map): Map by map