fix ownership inheritance

Author: oveeernight

usvm-core/src/main/kotlin/org/usvm/constraints/PathConstraints.kt

@@ -24,7 +24,7 @@ import org.usvm.uctx
  */
 open class UPathConstraints<Type>(
     protected val ctx: UContext<*>,
-    private var ownership: MutabilityOwnership,
+    protected open var ownership: MutabilityOwnership,
     protected val logicalConstraints: ULogicalConstraints = ULogicalConstraints.empty(),
     /**
      * Specially represented equalities and disequalities between objects, used in various part of constraints management.
@@ -52,7 +52,7 @@ open class UPathConstraints<Type>(
     /**
      * Recursively changes ownership for all nested data structures that use persistent maps.
      */
-    fun setOwnership(ownership: MutabilityOwnership) {
+    fun changeOwnership(ownership: MutabilityOwnership) {
         this.ownership = ownership
         numericConstraints.ownership = ownership
         equalityConstraints.ownership = ownership

usvm-jvm/src/main/kotlin/org/usvm/machine/state/JcState.kt

@@ -42,8 +42,8 @@ class JcState(
         val newThisOwnership = MutabilityOwnership()
         val cloneOwnership = MutabilityOwnership()
         val clonedConstraints = newConstraints?.also {
-            this.pathConstraints.setOwnership(newThisOwnership)
-            it.setOwnership(cloneOwnership)
+            this.pathConstraints.changeOwnership(newThisOwnership)
+            it.changeOwnership(cloneOwnership)
         } ?: pathConstraints.clone(newThisOwnership, cloneOwnership)
         this.ownership = newThisOwnership
         return JcState(

usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/PyPathConstraints.kt

@@ -15,7 +15,7 @@ import org.usvm.machine.types.PythonType
 
 class PyPathConstraints(
     ctx: UContext<*>,
-    private var ownership: MutabilityOwnership,
+    override var ownership: MutabilityOwnership,
     logicalConstraints: ULogicalConstraints = ULogicalConstraints.empty(),
     equalityConstraints: UEqualityConstraints = UEqualityConstraints(ctx, ownership),
     typeConstraints: UTypeConstraints<PythonType> = UTypeConstraints(

usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/PyState.kt

@@ -66,8 +66,8 @@ class PyState(
         val newThisOwnership = MutabilityOwnership()
         val cloneOwnership = MutabilityOwnership()
         val newPathConstraints = newConstraints?.also {
-            this.pathConstraints.setOwnership(newThisOwnership)
-            it.setOwnership(cloneOwnership)
+            this.pathConstraints.changeOwnership(newThisOwnership)
+            it.changeOwnership(cloneOwnership)
         } ?: pathConstraints.clone(newThisOwnership, cloneOwnership)
         val newMemory = memory.clone(newPathConstraints.typeConstraints, newThisOwnership, cloneOwnership)
         return PyState(

usvm-sample-language/src/main/kotlin/org/usvm/machine/SampleState.kt

@@ -47,8 +47,8 @@ class SampleState(
         val newThisOwnership = MutabilityOwnership()
         val cloneOwnership = MutabilityOwnership()
         val clonedConstraints = newConstraints?.also {
-            this.pathConstraints.setOwnership(newThisOwnership)
-            it.setOwnership(cloneOwnership)
+            this.pathConstraints.changeOwnership(newThisOwnership)
+            it.changeOwnership(cloneOwnership)
         } ?: pathConstraints.clone(newThisOwnership, cloneOwnership)
         return SampleState(
             ctx,

usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt

@@ -41,8 +41,8 @@ class TSState(
         val newThisOwnership = MutabilityOwnership()
         val cloneOwnership = MutabilityOwnership()
         val clonedConstraints = newConstraints?.also {
-            this.pathConstraints.setOwnership(newThisOwnership)
-            it.setOwnership(cloneOwnership)
+            this.pathConstraints.changeOwnership(newThisOwnership)
+            it.changeOwnership(cloneOwnership)
         } ?: pathConstraints.clone(newThisOwnership, cloneOwnership)
         this.ownership = newThisOwnership
 

usvm-util/src/main/kotlin/org/usvm/collections/immutable/extensions.kt

@@ -45,7 +45,7 @@ public fun <K, V> UPersistentHashMap<out K, V>.putAll(map: Map<out K, V>): UPers
  *
  * Entries of the map are iterated in the order they were specified.
  */
-// public fun <K, V> persistentMapOf(ownership: MutabilityOwnership, vararg pairs: Pair<K, V>): UPersistentHashMap<K, V> = 
+// public fun <K, V> persistentMapOf(ownership: MutabilityOwnership, vararg pairs: Pair<K, V>): UPersistentHashMap<K, V> =
 //    persistentMapBuilderOf(ownership, *pairs).build()
 
 /**

usvm-util/src/main/kotlin/org/usvm/collections/immutable/implementations/immutableMap/TrieNode.kt

@@ -432,7 +432,7 @@ class TrieNode<K, V>(
         if (nodeMap == 0) return buffer.size / ENTRY_SIZE
         val numValues = dataMap.countOneBits()
         var result = numValues
-        for(i in (numValues * ENTRY_SIZE) until buffer.size) {
+        for (i in (numValues * ENTRY_SIZE) until buffer.size) {
             result += nodeAtIndex(i).calculateSize()
         }
         return result

usvm-util/src/main/kotlin/org/usvm/collections/immutable/implementations/immutableSet/TrieNode.kt

@@ -216,7 +216,7 @@ class TrieNode<E>(
     private fun mutableCollisionRemove(element: E, owner: MutabilityOwnership): TrieNode<E> {
         val index = buffer.indexOf(element)
         if (index != -1) {
-            mutableRemovesCount++;
+            mutableRemovesCount++
             return collisionRemoveElementAtIndex(index, owner)
         }
         return this