diff --git a/usvm-core/src/main/kotlin/org/usvm/Context.kt b/usvm-core/src/main/kotlin/org/usvm/Context.kt index 64e0bb82d8..f15a9b8012 100644 --- a/usvm-core/src/main/kotlin/org/usvm/Context.kt +++ b/usvm-core/src/main/kotlin/org/usvm/Context.kt @@ -98,7 +98,7 @@ open class UContext( return nullRef } - val addressCounter = UAddressCounter() + open val addressCounter = UAddressCounter() fun mkAddressCounter(): UAddressCounter { return addressCounter diff --git a/usvm-core/src/main/kotlin/org/usvm/memory/Memory.kt b/usvm-core/src/main/kotlin/org/usvm/memory/Memory.kt index 251ce742e4..36cc14f4be 100644 --- a/usvm-core/src/main/kotlin/org/usvm/memory/Memory.kt +++ b/usvm-core/src/main/kotlin/org/usvm/memory/Memory.kt @@ -93,13 +93,13 @@ interface UWritableMemory : UReadOnlyMemory { } @Suppress("MemberVisibilityCanBePrivate") -class UMemory( - internal val ctx: UContext<*>, +open class UMemory( + val ctx: UContext<*>, override var ownership: MutabilityOwnership, override val types: UTypeConstraints, override val stack: URegistersStack = URegistersStack(), - private val mocks: UIndexedMocker = UIndexedMocker(), - private var regions: UPersistentHashMap, UMemoryRegion<*, *>> = persistentHashMapOf(), + val mocks: UIndexedMocker = UIndexedMocker(), + var regions: UPersistentHashMap, UMemoryRegion<*, *>> = persistentHashMapOf(), ) : UWritableMemory, UOwnedMergeable, MergeGuard> { override val mocker: UMocker @@ -155,7 +155,7 @@ class UMemory( override fun nullRef(): UHeapRef = ctx.nullRef - fun clone( + open fun clone( typeConstraints: UTypeConstraints, thisOwnership: MutabilityOwnership, cloneOwnership: MutabilityOwnership,