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
This commit is contained in:
committed by
Space Team
parent
7d584e0eb4
commit
672b5ba0d7
-18
@@ -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]
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
// TARGET_BACKEND: JVM
|
||||
// JVM_ABI_K1_K2_DIFF: KT-57268
|
||||
|
||||
import java.util.AbstractMap
|
||||
import java.util.Collections
|
||||
|
||||
-18
@@ -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]
|
||||
@@ -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>()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user