Rebase fixes

Author: sergeypospelov

usvm-core/src/main/kotlin/org/usvm/types/SupportTypeStream.kt

@@ -79,7 +79,7 @@ class USupportTypeStream<Type> private constructor(
         )
 
     override fun take(n: Int): Set<Type> {
-        val set = fromQueries.take(n).toMutableSet()
+        val set = cacheFromQueries.take(n).toMutableSet()
         val iterator = cachingSequence.iterator()
         while (set.size < n && iterator.hasNext()) {
             set += iterator.next()

usvm-jvm/src/main/kotlin/org/usvm/machine/JcExprResolver.kt

@@ -97,6 +97,7 @@ import org.usvm.machine.operator.JcUnaryOperator
 import org.usvm.machine.operator.ensureBvExpr
 import org.usvm.machine.operator.mkNarrow
 import org.usvm.machine.operator.wideTo32BitsIfNeeded
+import org.usvm.machine.resolver.JcInvokeResolver
 import org.usvm.machine.state.JcMethodResult
 import org.usvm.machine.state.JcState
 import org.usvm.machine.state.throwExceptionWithoutStackFrameDrop
@@ -336,7 +337,7 @@ class JcExprResolver(
             val argsWithTypes = expr.args.zip(method.parameters.map { it.type })
 
             argsWithTypes.mapTo(arguments) { (expr, type) ->
-                resolveJcExpr(expr, type) ?: return@resolveInvoke null
+                resolveJcExpr(expr, type) ?: return null
             }
             with(invokeResolver) { resolveSpecialInvoke(method.method, arguments) }
         }
@@ -390,9 +391,9 @@ class JcExprResolver(
         }
     }
 
-    private fun resolveInvoke(
+    private inline fun resolveInvoke(
         method: JcTypedMethod,
-        resolveArguments: () -> List<UExpr<out USort>>?,
+        onNoCallPresent: JcStepScope.() -> Unit,
     ): UExpr<out USort>? = ensureStaticFieldsInitialized(method.enclosingType) {
         resolveInvokeNoStaticInitializationCheck(onNoCallPresent)
     }
@@ -408,8 +409,7 @@ class JcExprResolver(
             }
 
             is JcMethodResult.NoCall -> {
-                val arguments = resolveArguments() ?: return null
-                scope.doWithState { addNewMethodCall(applicationGraph, method.method, arguments) }
+                scope.onNoCallPresent()
                 null
             }
 

usvm-jvm/src/main/kotlin/org/usvm/machine/JcInterpreter.kt

@@ -29,7 +29,6 @@ import org.usvm.UBoolExpr
 import org.usvm.UHeapRef
 import org.usvm.UInterpreter
 import org.usvm.URegisterLValue
-import org.usvm.machine.resolver.JcExprResolver
 import org.usvm.machine.resolver.JcTypeSelector
 import org.usvm.machine.resolver.JcVirtualInvokeResolver
 import org.usvm.machine.state.JcMethodResult

usvm-jvm/src/test/kotlin/org/usvm/samples/invokes/SimpleInterfaceExampleTest.kt

@@ -7,7 +7,6 @@ import org.usvm.test.util.checkers.eq
 
 internal class SimpleInterfaceExampleTest : JavaMethodTestRunner() {
     @Test
-    @Disabled("Expected exactly 3 executions, but 2 found. Virtual invokes are not supported yet")
     fun testOverrideMethod() {
         checkDiscoveredProperties(
             SimpleInterfaceExample::overrideMethod,