Review fixes

CaelmBleidd · CaelmBleidd · commit 87b841b0624c · 2025-06-10T17:42:44.000+03:00
diff --git a/usvm-ts/src/main/kotlin/org/usvm/machine/expr/TsExprResolver.kt b/usvm-ts/src/main/kotlin/org/usvm/machine/expr/TsExprResolver.kt
@@ -788,7 +788,7 @@ class TsExprResolver(
                 val fakeType = instanceRef.getFakeType(scope)
 
                 // If we want to get length from a fake object, we assume that it is an array.
-                scope.assert(fakeType.refTypeExpr)
+                scope.doWithState { pathConstraints += fakeType.refTypeExpr }
 
                 val refLValue = getIntermediateRefLValue(instanceRef.address)
                 val obj = scope.calcOnState { memory.read(refLValue) }
@@ -872,6 +872,12 @@ class TsExprResolver(
     }
 
     override fun visit(expr: EtsNewArrayExpr): UExpr<out USort>? = with(ctx) {
+        val arrayType = expr.type
+
+        require(arrayType is EtsArrayType) {
+            "Expected EtsArrayType in newArrayExpr, but got ${arrayType::class.simpleName}"
+        }
+
         scope.calcOnState {
             val size = resolve(expr.size) ?: return@calcOnState null
 
@@ -902,8 +908,6 @@ class TsExprResolver(
                 blockOnFalseState = allocateException(EtsStringType) // TODO incorrect exception type
             )
 
-            val arrayType = expr.type as EtsArrayType
-
             if (arrayType.elementType is EtsArrayType) {
                 TODO("Multidimensional arrays are not supported yet, https://github.com/UnitTestBot/usvm/issues/287")
             }
diff --git a/usvm-ts/src/test/kotlin/org/usvm/util/TsTestResolver.kt b/usvm-ts/src/test/kotlin/org/usvm/util/TsTestResolver.kt
@@ -109,7 +109,9 @@ class TsTestResolver {
                     resolvedLValuesToFakeObjects += arrayIndexLValue to fakeObject
                 }
 
-                else -> error("Unexpected lValue type: ${lValue::class.java.name}")
+                else -> {
+                    error("Unexpected lValue type: ${lValue::class.java.name}")
+                }
             }
         }
     }
@@ -265,7 +267,9 @@ open class TsTestStateResolver(
                         resolveExpr(fakeObject.extractRef(finalStateMemory))
                     }
 
-                    else -> error("Unsupported fake object type: $fakeType")
+                    else -> {
+                        error("Unsupported fake object type: $fakeType")
+                    }
                 }
             }
 
diff --git a/usvm-util/src/main/kotlin/org/usvm/test/util/checkers/Matchers.kt b/usvm-util/src/main/kotlin/org/usvm/test/util/checkers/Matchers.kt
@@ -22,7 +22,7 @@ val ignoreNumberOfAnalysisResults = AnalysisResultsNumberMatcher(
 
 val noResultsExpected = AnalysisResultsNumberMatcher(
     description = "No executions expected",
-    matcherFailedMessage = { it -> "Expected no analysis results, but $it executions were found" }
+    matcherFailedMessage = { "Expected no analysis results, but $it executions were found" }
 ) { it == 0 }
 
 class AnalysisResultsNumberMatcher(

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ class TsTestResolver {`
`109`	`109`	`resolvedLValuesToFakeObjects += arrayIndexLValue to fakeObject`
`110`	`110`	`}`
`111`	`111`
`112`		`- else -> error("Unexpected lValue type: ${lValue::class.java.name}")`
	`112`	`+ else -> {`
	`113`	`+ error("Unexpected lValue type: ${lValue::class.java.name}")`
	`114`	`+ }`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`	`}`
`@@ -265,7 +267,9 @@ open class TsTestStateResolver(`
`265`	`267`	`resolveExpr(fakeObject.extractRef(finalStateMemory))`
`266`	`268`	`}`
`267`	`269`
`268`		`- else -> error("Unsupported fake object type: $fakeType")`
	`270`	`+ else -> {`
	`271`	`+ error("Unsupported fake object type: $fakeType")`
	`272`	`+ }`
`269`	`273`	`}`
`270`	`274`	`}`
`271`	`275`