Specialize plus operator for UArrays (KT-28397)

libraries/stdlib/common/src/generated/_UArrays.kt

@@ -575,6 +575,134 @@ public inline fun UShortArray.copyOfRange(fromIndex: Int, toIndex: Int): UShortA
     return UShortArray(storage.copyOfRange(fromIndex, toIndex))
 }
 
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UIntArray.plus(element: UInt): UIntArray {
+    return UIntArray(storage + element.toInt())
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun ULongArray.plus(element: ULong): ULongArray {
+    return ULongArray(storage + element.toLong())
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UByteArray.plus(element: UByte): UByteArray {
+    return UByteArray(storage + element.toByte())
+}
+
+/**
+ * Returns an array containing all elements of the original array and then the given [element].
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UShortArray.plus(element: UShort): UShortArray {
+    return UShortArray(storage + element.toShort())
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public operator fun UIntArray.plus(elements: Collection<UInt>): UIntArray {
+    var index = size
+    val result = storage.copyOf(size + elements.size)
+    for (element in elements) result[index++] = element.toInt()
+    return UIntArray(result)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public operator fun ULongArray.plus(elements: Collection<ULong>): ULongArray {
+    var index = size
+    val result = storage.copyOf(size + elements.size)
+    for (element in elements) result[index++] = element.toLong()
+    return ULongArray(result)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public operator fun UByteArray.plus(elements: Collection<UByte>): UByteArray {
+    var index = size
+    val result = storage.copyOf(size + elements.size)
+    for (element in elements) result[index++] = element.toByte()
+    return UByteArray(result)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] collection.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+public operator fun UShortArray.plus(elements: Collection<UShort>): UShortArray {
+    var index = size
+    val result = storage.copyOf(size + elements.size)
+    for (element in elements) result[index++] = element.toShort()
+    return UShortArray(result)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UIntArray.plus(elements: UIntArray): UIntArray {
+    return UIntArray(storage + elements.storage)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun ULongArray.plus(elements: ULongArray): ULongArray {
+    return ULongArray(storage + elements.storage)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UByteArray.plus(elements: UByteArray): UByteArray {
+    return UByteArray(storage + elements.storage)
+}
+
+/**
+ * Returns an array containing all elements of the original array and then all elements of the given [elements] array.
+ */
+@SinceKotlin("1.3")
+@ExperimentalUnsignedTypes
+@kotlin.internal.InlineOnly
+public inline operator fun UShortArray.plus(elements: UShortArray): UShortArray {
+    return UShortArray(storage + elements.storage)
+}
+
 /**
  * Returns an array of type [ByteArray], which is a copy of this array where each element is a signed reinterpretation
  * of the corresponding element of this array.

libraries/stdlib/test/collections/UnsignedArraysTest.kt

@@ -9,6 +9,9 @@ package test.collections
 import test.collections.behaviors.collectionBehavior
 import kotlin.test.*
 
+fun assertArrayContentEquals(expected: UIntArray, actual: UIntArray, message: String = "") { assertTrue(expected contentEquals actual, message) }
+
+
 class UnsignedArraysTest {
 
     @Test
@@ -228,4 +231,11 @@ class UnsignedArraysTest {
         }
     }
 
+    @Test
+    fun plus() {
+        assertArrayContentEquals(uintArrayOf(1u, 2u, 3u), uintArrayOf(1u, 2u) + 3u)
+        assertArrayContentEquals(uintArrayOf(1u, 2u, 3u, 4u), uintArrayOf(1u, 2u) + listOf(3u, 4u))
+        assertArrayContentEquals(uintArrayOf(1u, 2u, 3u, 4u), uintArrayOf(1u, 2u) + uintArrayOf(3u, 4u))
+    }
+
 }

libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt

@@ -2299,6 +2299,10 @@ public final class kotlin/collections/UArraysKt {
 	public static final fun contentToString-GBYM_sE ([B)Ljava/lang/String;
 	public static final fun contentToString-QwZRm1k ([J)Ljava/lang/String;
 	public static final fun contentToString-rL5Bavg ([S)Ljava/lang/String;
+	public static final fun plus-CFIt9YE ([ILjava/util/Collection;)[I
+	public static final fun plus-kzHmqpY ([JLjava/util/Collection;)[J
+	public static final fun plus-ojwP5H8 ([SLjava/util/Collection;)[S
+	public static final fun plus-xo_DsdI ([BLjava/util/Collection;)[B
 	public static final fun random-2D5oskM ([ILkotlin/random/Random;)I
 	public static final fun random-JzugnMA ([JLkotlin/random/Random;)J
 	public static final fun random-oSF2wD8 ([BLkotlin/random/Random;)B

libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt

@@ -454,12 +454,23 @@ object ArrayOps : TemplateGroupBase() {
     }
 
     val f_plus = fn("plus(element: T)") {
-        include(InvariantArraysOfObjects, ArraysOfPrimitives)
+        include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
     } builderWith { primitive ->
         doc { "Returns an array containing all elements of the original array and then the given [element]." }
         operator()
         returns("SELF")
 
+        specialFor(ArraysOfUnsigned) {
+            inlineOnly()
+            val signedPrimitiveName = primitive!!.name.drop(1)
+            body {
+                """
+                return SELF(storage + element.to$signedPrimitiveName())
+                """
+            }
+        }
+
+        specialFor(InvariantArraysOfObjects, ArraysOfPrimitives) {
             on(Platform.JVM) {
                 body {
                     """
@@ -502,14 +513,28 @@ object ArrayOps : TemplateGroupBase() {
                 }
             }
         }
+    }
 
 
     val f_plus_collection = fn("plus(elements: Collection<T>)") {
-        include(InvariantArraysOfObjects, ArraysOfPrimitives)
+        include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
     } builder {
         operator()
         returns("SELF")
         doc { "Returns an array containing all elements of the original array and then all elements of the given [elements] collection." }
+
+        specialFor(ArraysOfUnsigned) {
+            val signedPrimitiveName = primitive!!.name.drop(1)
+            body {
+                """
+                var index = size
+                val result = storage.copyOf(size + elements.size)
+                for (element in elements) result[index++] = element.to$signedPrimitiveName()
+                return SELF(result)
+                """
+            }
+        }
+        specialFor(InvariantArraysOfObjects, ArraysOfPrimitives) {
             on(Platform.JVM) {
                 body {
                     """
@@ -570,13 +595,20 @@ object ArrayOps : TemplateGroupBase() {
                 }
             }
         }
+    }
 
     val f_plus_array = fn("plus(elements: SELF)") {
-        include(InvariantArraysOfObjects, ArraysOfPrimitives)
+        include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
     } builder {
         operator(true)
         doc { "Returns an array containing all elements of the original array and then all elements of the given [elements] array." }
         returns("SELF")
+
+        specialFor(ArraysOfUnsigned) {
+            inlineOnly()
+            body { "return SELF(storage + elements.storage)" }
+        }
+        specialFor(InvariantArraysOfObjects, ArraysOfPrimitives) {
             specialFor(InvariantArraysOfObjects) {
                 signature("plus(elements: Array<out T>)", notForSorting = true)
             }
@@ -622,6 +654,7 @@ object ArrayOps : TemplateGroupBase() {
                 }
             }
         }
+    }
 
     val f_copyInto = fn("copyInto(destination: SELF, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = size)") {
         include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)