Skip to content

Specify more concrete type of memoryRegionId to avoid useless cast #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

Specify more concrete type of memoryRegionId to avoid useless cast #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions usvm-jvm/src/main/kotlin/org/usvm/machine/JcTransformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ class JcStaticFieldDecoder<Sort : USort>(
class JcStaticFieldModel<Sort : USort>(
private val model: UModelEvaluator<*>,
private val translatedFields: Map<JcField, UExpr<Sort>>,
private val translator: UExprTranslator<*, *>
private val translator: UExprTranslator<*, *>,
) : UReadOnlyMemoryRegion<JcStaticFieldLValue<Sort>, Sort> {
override fun read(key: JcStaticFieldLValue<Sort>): UExpr<Sort> {
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)
}
Expand Down
4 changes: 2 additions & 2 deletions usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/statics/JcStaticFieldsRegion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ data class JcStaticFieldLValue<Sort : USort>(
val field: JcField,
override val sort: Sort,
) : ULValue<JcStaticFieldLValue<Sort>, Sort> {
override val memoryRegionId: UMemoryRegionId<JcStaticFieldLValue<Sort>, Sort> = JcStaticFieldRegionId(sort)
override val memoryRegionId: JcStaticFieldRegionId<Sort> = JcStaticFieldRegionId(sort)

override val key: JcStaticFieldLValue<Sort>
get() = this
Expand All @@ -59,7 +59,7 @@ internal class JcStaticFieldsMemoryRegion<Sort : USort>(
override fun read(key: JcStaticFieldLValue<Sort>): UExpr<Sort> {
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(
Expand Down