JetBrains · MatkovIvan · Dec 12, 2024 · Dec 12, 2024
diff --git a/collection/collection-ktx/api/1.5.0-beta01.txt b/collection/collection-ktx/api/1.5.0-beta01.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/collection/collection-ktx/api/restricted_1.5.0-beta01.txt b/collection/collection-ktx/api/restricted_1.5.0-beta01.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/collection/collection/api/1.5.0-beta01.txt b/collection/collection/api/1.5.0-beta01.txt
diff --git a/collection/collection/api/restricted_1.5.0-beta01.txt b/collection/collection/api/restricted_1.5.0-beta01.txt
diff --git a/collection/collection/bcv/native/current.txt b/collection/collection/bcv/native/current.txt
@@ -982,8 +982,6 @@ open class <#A: kotlin/Any?> androidx.collection/SparseArrayCompat { // androidx
 }
 
 sealed class <#A: kotlin/Any?, #B: kotlin/Any?> androidx.collection/ScatterMap { // androidx.collection/ScatterMap|null[0]
-    constructor <init>() // androidx.collection/ScatterMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/ScatterMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/ScatterMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/ScatterMap.size|{}size[0]
@@ -1025,8 +1023,6 @@ sealed class <#A: kotlin/Any?, #B: kotlin/Any?> androidx.collection/ScatterMap {
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/FloatObjectMap { // androidx.collection/FloatObjectMap|null[0]
-    constructor <init>() // androidx.collection/FloatObjectMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/FloatObjectMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/FloatObjectMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/FloatObjectMap.size|{}size[0]
@@ -1068,8 +1064,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/FloatObjectMap { // androidx.
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/IntObjectMap { // androidx.collection/IntObjectMap|null[0]
-    constructor <init>() // androidx.collection/IntObjectMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/IntObjectMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/IntObjectMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/IntObjectMap.size|{}size[0]
@@ -1111,8 +1105,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/IntObjectMap { // androidx.co
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/LongObjectMap { // androidx.collection/LongObjectMap|null[0]
-    constructor <init>() // androidx.collection/LongObjectMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/LongObjectMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/LongObjectMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/LongObjectMap.size|{}size[0]
@@ -1154,8 +1146,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/LongObjectMap { // androidx.c
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/ObjectFloatMap { // androidx.collection/ObjectFloatMap|null[0]
-    constructor <init>() // androidx.collection/ObjectFloatMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/ObjectFloatMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/ObjectFloatMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/ObjectFloatMap.size|{}size[0]
@@ -1198,8 +1188,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/ObjectFloatMap { // androidx.
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/ObjectIntMap { // androidx.collection/ObjectIntMap|null[0]
-    constructor <init>() // androidx.collection/ObjectIntMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/ObjectIntMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/ObjectIntMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/ObjectIntMap.size|{}size[0]
@@ -1242,8 +1230,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/ObjectIntMap { // androidx.co
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/ObjectList { // androidx.collection/ObjectList|null[0]
-    constructor <init>(kotlin/Int) // androidx.collection/ObjectList.<init>|<init>(kotlin.Int){}[0]
-
     final val indices // androidx.collection/ObjectList.indices|{}indices[0]
         final inline fun <get-indices>(): kotlin.ranges/IntRange // androidx.collection/ObjectList.indices.<get-indices>|<get-indices>(){}[0]
     final val lastIndex // androidx.collection/ObjectList.lastIndex|{}lastIndex[0]
@@ -1302,8 +1288,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/ObjectList { // androidx.coll
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/ObjectLongMap { // androidx.collection/ObjectLongMap|null[0]
-    constructor <init>() // androidx.collection/ObjectLongMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/ObjectLongMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/ObjectLongMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/ObjectLongMap.size|{}size[0]
@@ -1346,8 +1330,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/ObjectLongMap { // androidx.c
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/OrderedScatterSet { // androidx.collection/OrderedScatterSet|null[0]
-    constructor <init>() // androidx.collection/OrderedScatterSet.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/OrderedScatterSet.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/OrderedScatterSet.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/OrderedScatterSet.size|{}size[0]
@@ -1397,8 +1379,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/OrderedScatterSet { // androi
 }
 
 sealed class <#A: kotlin/Any?> androidx.collection/ScatterSet { // androidx.collection/ScatterSet|null[0]
-    constructor <init>() // androidx.collection/ScatterSet.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/ScatterSet.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/ScatterSet.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/ScatterSet.size|{}size[0]
@@ -1433,8 +1413,6 @@ sealed class <#A: kotlin/Any?> androidx.collection/ScatterSet { // androidx.coll
 }
 
 sealed class androidx.collection/DoubleList { // androidx.collection/DoubleList|null[0]
-    constructor <init>(kotlin/Int) // androidx.collection/DoubleList.<init>|<init>(kotlin.Int){}[0]
-
     final val indices // androidx.collection/DoubleList.indices|{}indices[0]
         final inline fun <get-indices>(): kotlin.ranges/IntRange // androidx.collection/DoubleList.indices.<get-indices>|<get-indices>(){}[0]
     final val lastIndex // androidx.collection/DoubleList.lastIndex|{}lastIndex[0]
@@ -1487,8 +1465,6 @@ sealed class androidx.collection/DoubleList { // androidx.collection/DoubleList|
 }
 
 sealed class androidx.collection/FloatFloatMap { // androidx.collection/FloatFloatMap|null[0]
-    constructor <init>() // androidx.collection/FloatFloatMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/FloatFloatMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/FloatFloatMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/FloatFloatMap.size|{}size[0]
@@ -1531,8 +1507,6 @@ sealed class androidx.collection/FloatFloatMap { // androidx.collection/FloatFlo
 }
 
 sealed class androidx.collection/FloatIntMap { // androidx.collection/FloatIntMap|null[0]
-    constructor <init>() // androidx.collection/FloatIntMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/FloatIntMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/FloatIntMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/FloatIntMap.size|{}size[0]
@@ -1575,8 +1549,6 @@ sealed class androidx.collection/FloatIntMap { // androidx.collection/FloatIntMa
 }
 
 sealed class androidx.collection/FloatList { // androidx.collection/FloatList|null[0]
-    constructor <init>(kotlin/Int) // androidx.collection/FloatList.<init>|<init>(kotlin.Int){}[0]
-
     final val indices // androidx.collection/FloatList.indices|{}indices[0]
         final inline fun <get-indices>(): kotlin.ranges/IntRange // androidx.collection/FloatList.indices.<get-indices>|<get-indices>(){}[0]
     final val lastIndex // androidx.collection/FloatList.lastIndex|{}lastIndex[0]
@@ -1629,8 +1601,6 @@ sealed class androidx.collection/FloatList { // androidx.collection/FloatList|nu
 }
 
 sealed class androidx.collection/FloatLongMap { // androidx.collection/FloatLongMap|null[0]
-    constructor <init>() // androidx.collection/FloatLongMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/FloatLongMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/FloatLongMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/FloatLongMap.size|{}size[0]
@@ -1673,8 +1643,6 @@ sealed class androidx.collection/FloatLongMap { // androidx.collection/FloatLong
 }
 
 sealed class androidx.collection/FloatSet { // androidx.collection/FloatSet|null[0]
-    constructor <init>() // androidx.collection/FloatSet.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/FloatSet.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/FloatSet.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/FloatSet.size|{}size[0]
@@ -1708,8 +1676,6 @@ sealed class androidx.collection/FloatSet { // androidx.collection/FloatSet|null
 }
 
 sealed class androidx.collection/IntFloatMap { // androidx.collection/IntFloatMap|null[0]
-    constructor <init>() // androidx.collection/IntFloatMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/IntFloatMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/IntFloatMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/IntFloatMap.size|{}size[0]
@@ -1752,8 +1718,6 @@ sealed class androidx.collection/IntFloatMap { // androidx.collection/IntFloatMa
 }
 
 sealed class androidx.collection/IntIntMap { // androidx.collection/IntIntMap|null[0]
-    constructor <init>() // androidx.collection/IntIntMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/IntIntMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/IntIntMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/IntIntMap.size|{}size[0]
@@ -1796,8 +1760,6 @@ sealed class androidx.collection/IntIntMap { // androidx.collection/IntIntMap|nu
 }
 
 sealed class androidx.collection/IntList { // androidx.collection/IntList|null[0]
-    constructor <init>(kotlin/Int) // androidx.collection/IntList.<init>|<init>(kotlin.Int){}[0]
-
     final val indices // androidx.collection/IntList.indices|{}indices[0]
         final inline fun <get-indices>(): kotlin.ranges/IntRange // androidx.collection/IntList.indices.<get-indices>|<get-indices>(){}[0]
     final val lastIndex // androidx.collection/IntList.lastIndex|{}lastIndex[0]
@@ -1850,8 +1812,6 @@ sealed class androidx.collection/IntList { // androidx.collection/IntList|null[0
 }
 
 sealed class androidx.collection/IntLongMap { // androidx.collection/IntLongMap|null[0]
-    constructor <init>() // androidx.collection/IntLongMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/IntLongMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/IntLongMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/IntLongMap.size|{}size[0]
@@ -1894,8 +1854,6 @@ sealed class androidx.collection/IntLongMap { // androidx.collection/IntLongMap|
 }
 
 sealed class androidx.collection/IntSet { // androidx.collection/IntSet|null[0]
-    constructor <init>() // androidx.collection/IntSet.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/IntSet.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/IntSet.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/IntSet.size|{}size[0]
@@ -1929,8 +1887,6 @@ sealed class androidx.collection/IntSet { // androidx.collection/IntSet|null[0]
 }
 
 sealed class androidx.collection/LongFloatMap { // androidx.collection/LongFloatMap|null[0]
-    constructor <init>() // androidx.collection/LongFloatMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/LongFloatMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/LongFloatMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/LongFloatMap.size|{}size[0]
@@ -1973,8 +1929,6 @@ sealed class androidx.collection/LongFloatMap { // androidx.collection/LongFloat
 }
 
 sealed class androidx.collection/LongIntMap { // androidx.collection/LongIntMap|null[0]
-    constructor <init>() // androidx.collection/LongIntMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/LongIntMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/LongIntMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/LongIntMap.size|{}size[0]
@@ -2017,8 +1971,6 @@ sealed class androidx.collection/LongIntMap { // androidx.collection/LongIntMap|
 }
 
 sealed class androidx.collection/LongList { // androidx.collection/LongList|null[0]
-    constructor <init>(kotlin/Int) // androidx.collection/LongList.<init>|<init>(kotlin.Int){}[0]
-
     final val indices // androidx.collection/LongList.indices|{}indices[0]
         final inline fun <get-indices>(): kotlin.ranges/IntRange // androidx.collection/LongList.indices.<get-indices>|<get-indices>(){}[0]
     final val lastIndex // androidx.collection/LongList.lastIndex|{}lastIndex[0]
@@ -2071,8 +2023,6 @@ sealed class androidx.collection/LongList { // androidx.collection/LongList|null
 }
 
 sealed class androidx.collection/LongLongMap { // androidx.collection/LongLongMap|null[0]
-    constructor <init>() // androidx.collection/LongLongMap.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/LongLongMap.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/LongLongMap.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/LongLongMap.size|{}size[0]
@@ -2115,8 +2065,6 @@ sealed class androidx.collection/LongLongMap { // androidx.collection/LongLongMa
 }
 
 sealed class androidx.collection/LongSet { // androidx.collection/LongSet|null[0]
-    constructor <init>() // androidx.collection/LongSet.<init>|<init>(){}[0]
-
     final val capacity // androidx.collection/LongSet.capacity|{}capacity[0]
         final fun <get-capacity>(): kotlin/Int // androidx.collection/LongSet.capacity.<get-capacity>|<get-capacity>(){}[0]
     final val size // androidx.collection/LongSet.size|{}size[0]

diff --git a/collection/collection/build.gradle b/collection/collection/build.gradle
@@ -66,7 +66,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(libs.kotlinStdlib)
-                implementation(project(":annotation:annotation"))
+                implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
                 implementation(libs.atomicFu)
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatFloatMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatFloatMap.kt
@@ -539,7 +539,8 @@ public sealed class FloatFloatMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatFloatPair.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatFloatPair.kt
@@ -28,6 +28,7 @@ import kotlin.jvm.JvmInline
  * from Java code. Java developers can get the same functionality by using [Pair] or by constructing
  * a custom implementation using Float parameters directly (see [LongLongPair] for an example).
  */
+@Suppress("ValueClassDefinition")
 @JvmInline
 public value class FloatFloatPair
 internal constructor(

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatIntMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatIntMap.kt
@@ -537,7 +537,8 @@ public sealed class FloatIntMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/FloatLongMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/FloatLongMap.kt
@@ -539,7 +539,8 @@ public sealed class FloatLongMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/IntFloatMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/IntFloatMap.kt
@@ -537,7 +537,8 @@ public sealed class IntFloatMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/IntIntMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/IntIntMap.kt
@@ -537,7 +537,8 @@ public sealed class IntIntMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/IntIntPair.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/IntIntPair.kt
@@ -27,6 +27,7 @@ import kotlin.jvm.JvmInline
  * from Java code. Java developers can get the same functionality by using [Pair] or by constructing
  * a custom implementation using Int parameters directly (see [LongLongPair] for an example).
  */
+@Suppress("ValueClassDefinition")
 @JvmInline
 public value class IntIntPair
 internal constructor(

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/IntLongMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/IntLongMap.kt
@@ -537,7 +537,8 @@ public sealed class IntLongMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/LongFloatMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/LongFloatMap.kt
@@ -539,7 +539,8 @@ public sealed class LongFloatMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/LongIntMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/LongIntMap.kt
@@ -537,7 +537,8 @@ public sealed class LongIntMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/LongLongMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/LongLongMap.kt
@@ -537,7 +537,8 @@ public sealed class LongLongMap {
         }
 
         forEach { key, value ->
-            if (value != other[key]) {
+            val index = other.findKeyIndex(key)
+            if (index < 0 || value != other.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectFloatMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectFloatMap.kt
@@ -547,7 +547,8 @@ public sealed class ObjectFloatMap<K> {
         @Suppress("UNCHECKED_CAST") val o = other as ObjectFloatMap<Any?>
 
         forEach { key, value ->
-            if (value != o[key]) {
+            val index = o.findKeyIndex(key)
+            if (index < 0 || value != o.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectIntMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectIntMap.kt
@@ -547,7 +547,8 @@ public sealed class ObjectIntMap<K> {
         @Suppress("UNCHECKED_CAST") val o = other as ObjectIntMap<Any?>
 
         forEach { key, value ->
-            if (value != o[key]) {
+            val index = o.findKeyIndex(key)
+            if (index < 0 || value != o.values[index]) {
                 return false
             }
         }

diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectLongMap.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/ObjectLongMap.kt
@@ -547,7 +547,8 @@ public sealed class ObjectLongMap<K> {
         @Suppress("UNCHECKED_CAST") val o = other as ObjectLongMap<Any?>
 
         forEach { key, value ->
-            if (value != o[key]) {
+            val index = o.findKeyIndex(key)
+            if (index < 0 || value != o.values[index]) {
                 return false
             }
         }