From 7790cdd535e4d090fb24a171880352d4807b848c Mon Sep 17 00:00:00 2001 From: Konstantin Chukharev Date: Mon, 1 Sep 2025 18:26:24 +0300 Subject: [PATCH] Specify more concrete type of memoryRegionId to avoid useless cast --- usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt | 4 ++-- .../usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt b/usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt index 50de13c8c4..c4448128e6 100644 --- a/usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt +++ b/usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt @@ -62,12 +62,12 @@ class JcStaticFieldDecoder( class JcStaticFieldModel( private val model: UModelEvaluator<*>, private val translatedFields: Map>, - private val translator: UExprTranslator<*, *> + private val translator: UExprTranslator<*, *>, ) : UReadOnlyMemoryRegion, Sort> { override fun read(key: JcStaticFieldLValue): UExpr { val translated = translatedFields[key.field] ?: translator.translate( - key.sort.jctx.mkStaticFieldReading(key.memoryRegionId as JcStaticFieldRegionId, key.field, key.sort) + key.sort.jctx.mkStaticFieldReading(key.memoryRegionId, key.field, key.sort) ) return model.evalAndComplete(translated) } diff --git a/usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt b/usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt index 43299ebd8d..05faf08a92 100644 --- a/usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt +++ b/usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt @@ -34,7 +34,7 @@ data class JcStaticFieldLValue( val field: JcField, override val sort: Sort, ) : ULValue, Sort> { - override val memoryRegionId: UMemoryRegionId, Sort> = JcStaticFieldRegionId(sort) + override val memoryRegionId: JcStaticFieldRegionId = JcStaticFieldRegionId(sort) override val key: JcStaticFieldLValue get() = this @@ -59,7 +59,7 @@ internal class JcStaticFieldsMemoryRegion( override fun read(key: JcStaticFieldLValue): UExpr { val field = key.field return fieldValuesByClass[field.enclosingClass]?.get(field) - ?: sort.jctx.mkStaticFieldReading(key.memoryRegionId as JcStaticFieldRegionId, field, sort) + ?: sort.jctx.mkStaticFieldReading(key.memoryRegionId, field, sort) } override fun write(