[WIP] Dev sync

UnitTestBot · Aug 7, 2024 · 979e1e5 · 979e1e5
1 parent 8d8ed58
commit 979e1e5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSExprResolver.kt b/usvm-ts/src/main/kotlin/org/usvm/TSExprResolver.kt
@@ -85,7 +85,7 @@ class TSExprResolver(
     fun resolveLValue(value: EtsValue): ULValue<*, *>? =
         when (value) {
             is EtsParameterRef,
-            is EtsLocal -> simpleValueResolver.resolveLocal(value)
+            is EtsLocal, -> simpleValueResolver.resolveLocal(value)
             else -> error("Unexpected value: $value")
         }
 

diff --git a/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt b/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt
@@ -89,6 +89,14 @@ open class TSMethodTestRunner : TestRunner<TSTest, MethodDescriptor, EtsType?, T
         )
     }
 
+    /*
+        For now type checks are disabled for development purposes
+
+        See https://github.com/UnitTestBot/usvm/issues/203
+     */
+    override val checkType: (EtsType?, EtsType?) -> Boolean
+        get() = { _, _ -> true }
+
     override val typeTransformer: (Any?) -> EtsType
         get() = {
             // Both KClass and TSObject instances come here
@@ -108,13 +116,6 @@ open class TSMethodTestRunner : TestRunner<TSTest, MethodDescriptor, EtsType?, T
             }
         }
 
-    /*
-        For now type checks are disabled for development purposes
-        TODO: implement
-     */
-    override val checkType: (EtsType?, EtsType?) -> Boolean
-        get() = { _, _ -> true }
-
     private fun getProject(fileName: String): EtsFile {
         val jsonWithoutExtension = "/ir/$fileName.json"
         val sampleFilePath = javaClass.getResourceAsStream(jsonWithoutExtension)

diff --git a/usvm-ts/src/test/kotlin/org/usvm/util/TSTestResolver.kt b/usvm-ts/src/test/kotlin/org/usvm/util/TSTestResolver.kt
@@ -29,7 +29,8 @@ class TSTestResolver {
         val model = state.models.first()
         when (val methodResult = state.methodResult) {
             is TSMethodResult.Success -> {
-                val returnValue = resolveExpr(model.eval(methodResult.value), method.returnType)
+                val valueToResolve = model.eval(methodResult.value)
+                val returnValue = resolveExpr(valueToResolve, method.returnType)
                 val params = method.parameters.mapIndexed { idx, param ->
                     val lValue = URegisterStackLValue(typeToSort(param.type), idx)
                     val expr = model.read(lValue)