Skip to content

Made plusAssign of UPathConstraints non-recursive #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dvvrd merged 2 commits into from
Sep 23, 2025
Merged

Made plusAssign of UPathConstraints non-recursive #338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca356d0
Made `plusAssign` of `UPathConstraints` non-recursive
tochilinak Sep 23, 2025
babc35d
formatting
tochilinak Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions usvm-core/src/main/kotlin/org/usvm/constraints/PathConstraints.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,17 @@ open class UPathConstraints<Type>(
typeConstraints.constraints()
}

operator fun plusAssign(constraint: UBoolExpr) {
val queue = ArrayDeque<UBoolExpr>()
queue.add(constraint)
while (queue.isNotEmpty()) {
val c = queue.removeFirst()
addConstraint(c, queue)
}
}

@Suppress("UNCHECKED_CAST")
open operator fun plusAssign(constraint: UBoolExpr): Unit =
protected open fun addConstraint(constraint: UBoolExpr, queue: ArrayDeque<UBoolExpr>): Unit =
with(constraint.uctx) {
when {
constraint == falseExpr -> contradiction(this)
Expand Down Expand Up @@ -131,7 +140,7 @@ open class UPathConstraints<Type>(
typeConstraints.addSubtype(constraint.ref, constraint.subtype as Type)
}

constraint is UAndExpr -> constraint.args.forEach(::plusAssign)
constraint is UAndExpr -> queue.addAll(constraint.args)

constraint is UNotExpr -> {
val notConstraint = constraint.arg
Expand Down Expand Up @@ -172,7 +181,7 @@ open class UPathConstraints<Type>(

notConstraint in logicalConstraints -> contradiction(ctx)

notConstraint is UOrExpr -> notConstraint.args.forEach { plusAssign(ctx.mkNot(it)) }
notConstraint is UOrExpr -> queue.addAll(notConstraint.args.map(::mkNot))

else -> logicalConstraints.add(constraint, ownership)
}
Expand Down