Skip to content

Commit ff7b80f

Browse files
committed
Rebase
1 parent 514b55d commit ff7b80f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

usvm-ml-path-selection/src/main/kotlin/org/usvm/jvm/interpreter/JcBlockInterpreter.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.usvm.api.allocateStaticRef
1212
import org.usvm.api.evalTypeEquals
1313
import org.usvm.api.targets.JcTarget
1414
import org.usvm.api.typeStreamOf
15+
import org.usvm.forkblacklists.UForkBlackList
1516
import org.usvm.jvm.JcApplicationBlockGraph
1617
import org.usvm.machine.*
1718
import org.usvm.machine.interpreter.JcExprResolver
@@ -31,6 +32,7 @@ import org.usvm.util.write
3132
class JcBlockInterpreter(
3233
private val ctx: JcContext,
3334
private val applicationGraph: JcApplicationBlockGraph,
35+
var forkBlackList: UForkBlackList<JcState, JcInst> = UForkBlackList.createDefault(),
3436
) : UInterpreter<JcState>() {
3537

3638
companion object {
@@ -67,7 +69,7 @@ class JcBlockInterpreter(
6769
}
6870
}
6971

70-
val solver = ctx.solver<JcType, JcContext>()
72+
val solver = ctx.solver<JcType>()
7173

7274
val model = (solver.checkWithSoftConstraints(state.pathConstraints) as USatResult).model
7375
state.models = listOf(model)
@@ -82,7 +84,7 @@ class JcBlockInterpreter(
8284

8385
logger.debug("Step: {}", stmt)
8486

85-
val scope = StepScope(state)
87+
val scope = StepScope(state, forkBlackList)
8688

8789
// handle exception firstly
8890
val result = state.methodResult

usvm-ml-path-selection/src/main/kotlin/org/usvm/ps/Utils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class IDGenerator {
4949
}
5050
}
5151

52-
fun <Type> UPathConstraints<Type, *>.size(): Int {
52+
fun <Type> UPathConstraints<Type>.size(): Int {
5353
return numericConstraints.constraints().count() +
5454
this.equalityConstraints.distinctReferences.count() +
5555
this.equalityConstraints.equalReferences.count() +

0 commit comments

Comments
 (0)