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

Fix addAll & putAll invocations on inline mutable collections

Browse Source 
^KT-54950: Fixed
This commit is contained in:
vladislav.grechko
2022-11-23 18:03:41 +01:00
committed by teamcity
parent 8fc787d6df
commit e0c13e5276
15 changed files with 99 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/inlineClasses/inlineClassCollection/inlineMutableCollectionBulkAdd.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// IGNORE_BACKEND: JVM
OPTIONAL_JVM_INLINE_ANNOTATION
value class IC1<T>(val list: MutableList<T>) : MutableList<T> by list
OPTIONAL_JVM_INLINE_ANNOTATION
value class IC2<T>(val x: Int) : MutableCollection<T> {
override val size: Int
get() = TODO("Not yet implemented")
override fun clear() = TODO()
override fun addAll(elements: Collection<T>) = true
override fun add(element: T) = TODO()
override fun isEmpty() = TODO()
override fun iterator() = TODO()
override fun retainAll(elements: Collection<T>) = TODO()
override fun removeAll(elements: Collection<T>) = TODO()
override fun remove(element: T) = TODO()
override fun containsAll(elements: Collection<T>) = TODO()
override fun contains(element: T) = TODO()
}
OPTIONAL_JVM_INLINE_ANNOTATION
value class IC3<T>(val map: MutableMap<T, T>) : MutableMap<T, T> by map
fun box(): String {
val inlineList = IC1(mutableListOf("a1")).also { it.addAll(0, listOf("a2", "a3")) }
if (inlineList.list != listOf("a2", "a3", "a1")) return "Fail 1"
if (!IC2<String>(1).addAll(setOf("b"))) return "Fail 2"
val inlineMap = IC3(mutableMapOf("a" to "b")).also { it.putAll(mapOf("b" to "c", "c" to "d")) }
if (inlineMap.map != mapOf("a" to "b", "b" to "c", "c" to "d")) return "Fail 3"
return "OK"
}
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection_ir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class InlineMutableCollection {
public method add(p0: java.lang.Object): boolean
public static method add-impl(p0: java.util.Collection, p1: java.lang.Object): boolean
public method addAll(p0: java.util.Collection): boolean
public static method addAll-impl(p0: InlineMutableCollection, p1: java.util.Collection): boolean
public static method addAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean
public synthetic final static method box-impl(p0: java.util.Collection): InlineMutableCollection
public method clear(): void
public static method clear-impl(p0: java.util.Collection): void
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList_ir.txt
Vendored
+2 -2
View File
@@ -8,8 +8,8 @@ public final class InlineMutableList {
public static method add-impl(p0: java.util.List, p1: java.lang.Object): boolean
public method addAll(p0: int, p1: java.util.Collection): boolean
public method addAll(p0: java.util.Collection): boolean
public static method addAll-impl(p0: InlineMutableList, p1: int, p2: java.util.Collection): boolean
public static method addAll-impl(p0: InlineMutableList, p1: java.util.Collection): boolean
public static method addAll-impl(p0: java.util.List, p1: int, p2: java.util.Collection): boolean
public static method addAll-impl(p0: java.util.List, p1: java.util.Collection): boolean
public synthetic final static method box-impl(p0: java.util.List): InlineMutableList
public method clear(): void
public static method clear-impl(p0: java.util.List): void
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap_ir.txt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ public final class InlineMutableMap {
public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
public static method put-impl(p0: java.util.Map, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object
public method putAll(p0: java.util.Map): void
public static method putAll-impl(p0: InlineMutableMap, p1: java.util.Map): void
public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void
public method remove(p0: java.lang.Object): java.lang.Object
public static method remove-impl(p0: java.util.Map, p1: java.lang.Object): java.lang.Object
public synthetic bridge method size(): int
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet_ir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class InlineMutableSet {
public method add(p0: java.lang.Object): boolean
public static method add-impl(p0: java.util.Set, p1: java.lang.Object): boolean
public method addAll(p0: java.util.Collection): boolean
public static method addAll-impl(p0: InlineMutableSet, p1: java.util.Collection): boolean
public static method addAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean
public synthetic final static method box-impl(p0: java.util.Set): InlineMutableSet
public method clear(): void
public static method clear-impl(p0: java.util.Set): void