Support static fields #261
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
usvm-ts/src/main/kotlin/org/usvm/machine/interpreter/TsStaticFieldsRegion.kt
Dismissed
Show dismissed
Hide dismissed
usvm-ts/src/main/kotlin/org/usvm/machine/interpreter/TsStaticFieldsRegion.kt
Dismissed
Show dismissed
Hide dismissed
usvm-ts/src/main/kotlin/org/usvm/machine/interpreter/TsStaticFieldsRegion.kt
Dismissed
Show dismissed
Hide dismissed
Lipen
force-pushed
the
lipen/ts-static
branch
from
e40180a to
ed144e0
Compare
| private val staticFieldReadings = mkAstInterner<TsStaticFieldReading<*>>() | ||
| fun <Sort : USort> mkStaticFieldReading( | ||
| regionId: TsStaticFieldRegionId<Sort>, | ||
| field: EtsFieldSignature, |
There was a problem hiding this comment.
fieldSignature might be confusing due to type usage in it
| ) : UComposer<EtsType, TsSizeSort>(ctx, memory, ownership), TsTransformer | ||
| ) : UComposer<EtsType, TsSizeSort>(ctx, memory, ownership), TsTransformer { | ||
| override fun <Sort : USort> transform(expr: TsStaticFieldReading<Sort>): UExpr<Sort> { | ||
| return memory.read(TsStaticFieldLValue(expr.field, expr.sort)) |
There was a problem hiding this comment.
Let's create util methods for these field values consturctors, that will create lValue from fields' name
|
|
||
| fun translate(expr: TsStaticFieldReading<Sort>): UExpr<Sort> = | ||
| translated.getOrPut(expr.field) { | ||
| expr.sort.mkConst("${expr.field.enclosingClass}_${regionId.sort}_${expr.field.name}") |
There was a problem hiding this comment.
usage of enclosing class seems suspicious here since it if often unk/unk, so many fields will be conflicting
| override fun read(key: TsStaticFieldLValue<Sort>): UExpr<Sort> { | ||
| val translated = translatedFields[key.field] | ||
| ?: translator.translate( | ||
| key.sort.tctx.mkStaticFieldReading(key.memoryRegionId as TsStaticFieldRegionId, key.field, key.sort) |
There was a problem hiding this comment.
again, usage of fields should be considered as suspicious
usvm-ts/src/main/kotlin/org/usvm/machine/expr/TsExprResolver.kt
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| val fieldType = scene.fieldLookUp(value.field).type | ||
| val sort = typeToSort(fieldType) |
There was a problem hiding this comment.
what if sort is unresolved, so we need to process using fake objects somehow
| val instance = exprResolver.resolve(lhv.instance)?.asExpr(addressSort) ?: return@doWithState | ||
| val field = lhv.field | ||
| val fieldType = scene.fieldLookUp(field).type | ||
| val sort = typeToSort(fieldType) | ||
| val lValue = UFieldLValue(sort, instance, field.name) | ||
| memory.write(lValue, expr.asExpr(lValue.sort), guard = trueExpr) | ||
| } | ||
|
|
||
| is EtsStaticFieldRef -> { | ||
| val field = lhv.field | ||
| val fieldType = scene.fieldLookUp(field).type | ||
| val sort = typeToSort(fieldType) | ||
| val lValue = TsStaticFieldLValue(field, sort) | ||
| memory.write(lValue, expr.asExpr(lValue.sort), guard = trueExpr) | ||
| } |
There was a problem hiding this comment.
Same issued with field and unresolved sort
| localVarToIdx.getOrPut(method) { | ||
| method.getDeclaredLocals().mapIndexed { idx, local -> | ||
| local.name to idx + method.parametersWithThisCount | ||
| }.toMap() | ||
| }[local.name] | ||
| ?: error("Local not declared: $local") |
There was a problem hiding this comment.
Formatting, lets extract something into variables
| class TsStaticFieldReading<Sort : USort> internal constructor( | ||
| ctx: TsContext, | ||
| val regionId: TsStaticFieldRegionId<Sort>, | ||
| val field: EtsFieldSignature, |
There was a problem hiding this comment.
Maybe we should replace signature with name or how to process it correctly?
Lipen
force-pushed
the
lipen/ts-static
branch
2 times, most recently
from
58c8dee to
3579c90
Compare
| val clazz = classes.single() | ||
| return clazz.fields.single { it.name == field.name } | ||
| } | ||
| val fields = classes.flatMap { it.fields.filter { it.name == field.name } } |
Check warning
Code scanning / detekt
Disallow shadowing variable declarations. Warning
| val clazz = classes.single() | ||
| return clazz.fields.single { it.name == field.name } | ||
| } | ||
| val fields = classes.flatMap { it.fields.filter { it.name == field.name } } |
Check warning
Code scanning / detekt
Disallow shadowing variable declarations. Warning
| } | ||
| } | ||
|
|
||
| val fields = ctx.scene.projectAndSdkClasses.flatMap { it.fields.filter { it.name == field.name } } |
Check warning
Code scanning / detekt
Disallow shadowing variable declarations. Warning
Squashed, Jc-like impl
Lipen
force-pushed
the
lipen/ts-static
branch
from
17ad4d3 to
9541694
Compare
| } | ||
|
|
||
| internal fun TsState.isInitialized(clazz: EtsClass): Boolean { | ||
| val instance = staticStorage[clazz]!! |
Check warning
Code scanning / detekt
Unsafe calls on nullable types detected. These calls will throw a NullPointerException in case the nullable value is null. Warning
| } | ||
|
|
||
| internal fun TsState.markInitialized(clazz: EtsClass) { | ||
| val instance = staticStorage[clazz]!! |
Check warning
Code scanning / detekt
Unsafe calls on nullable types detected. These calls will throw a NullPointerException in case the nullable value is null. Warning
This PR adds support for static fields.
Currently, this is just a (partial) copy of Jc-impl.