azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Mikhail Glukhikh
2024-01-24 16:50:47 +01:00
committed by Space Team
parent 7d584e0eb4
commit 672b5ba0d7
87 changed files with 352 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.kt
Vendored
-3
View File
@@ -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
Vendored
-3
View File
@@ -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
Vendored
-3
View File
@@ -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
Vendored
-3
View File
@@ -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
Vendored
-3
View File
@@ -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
Vendored
-3
View File
@@ -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>