diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt index f5c86e7bcbd..45f968c5c5c 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt @@ -7,25 +7,12 @@ package org.jetbrains.kotlin.descriptors.commonizer.utils import com.intellij.util.SmartFMap import gnu.trove.THashMap -import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import java.util.* import java.util.Collections.singletonList import java.util.Collections.singletonMap import kotlin.collections.ArrayList -internal infix fun Map.compactConcat(other: Map): Map = - when { - isEmpty() -> other - other.isEmpty() -> this - else -> when (val capacity = size + other.size) { - 0, 1 -> error("Unreachable code") - 2, 3 -> SmartFMap.emptyMap().plusAll(this).plusAll(other) - else -> THashMap(capacity).also { it.putAll(this); it.putAll(other) } - } - } - internal inline fun Map.compactMapValues(transform: (Map.Entry) -> R): Map = when (size) { 0 -> emptyMap() @@ -74,9 +61,6 @@ internal inline fun List.compact(): List = } } -internal inline fun Annotations.compactMap(transform: (AnnotationDescriptor) -> R): List = - if (isEmpty()) emptyList() else map(transform).compact() - internal fun Map.compact(): Map = when (size) { 0 -> emptyMap()