minor

UnitTestBot · Dec 16, 2024 · 64e6c9a · 64e6c9a
1 parent 35cc966
commit 64e6c9a
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/usvm-core/src/main/kotlin/org/usvm/collection/set/primitive/USymbolicSetUnionAdapter.kt b/usvm-core/src/main/kotlin/org/usvm/collection/set/primitive/USymbolicSetUnionAdapter.kt
@@ -76,15 +76,19 @@ sealed class USymbolicSetUnionAdapter<
                 this(WeakReference(key), composer?.let { WeakReference(it) }, result)
 
         fun containsCachedValue(key: Key, composer: UComposer<*, *>?): Boolean {
-            val thisKey = this.key.get() ?: return false
-            if (thisKey != key) return false
+            if (!this.key.equalTo(key)) return false
 
-            if (composer == null) {
-                return this.composer == null
-            }
+            val thisComposer = this.composer ?: return composer == null
+            if (composer == null) return false
+
+            return thisComposer.equalTo(composer)
+        }
 
-            val thisComposer = this.composer?.get() ?: return false
-            return thisComposer == composer
+        companion object {
+            private fun <T> WeakReference<T>.equalTo(other: T): Boolean {
+                val value = get() ?: return false
+                return value == other
+            }
         }
     }
 }