Skip to content

Solver optimizations #1265

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
CaelmBleidd merged 4 commits into from
Nov 1, 2022
Merged

Solver optimizations #1265

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a08b82
Solver optimizations
CaelmBleidd Oct 31, 2022
f4b7a76
Soot class comparison fix
CaelmBleidd Nov 1, 2022
bf326f3
Add a comment about fallbacks for types
CaelmBleidd Nov 1, 2022
a38d250
Review fixes
CaelmBleidd Nov 1, 2022
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
Prev Previous commit
Review fixes
  • Loading branch information
@CaelmBleidd
CaelmBleidd committed Nov 1, 2022
commit a38d250333d3d12996e28923a324d79b5a7f05f0
7 changes: 5 additions & 2 deletions utbot-framework/src/main/kotlin/org/utbot/engine/pc/Z3TranslatorVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import org.utbot.engine.types.TypeRegistry.Companion.numberOfTypes
import org.utbot.framework.UtSettings
import org.utbot.framework.UtSettings.maxTypeNumberForEnumeration
import org.utbot.framework.UtSettings.useBitVecBasedTypeSystem
import polyglot.main.Report.types
import java.util.IdentityHashMap
import soot.PrimType
import soot.RefType
Expand Down Expand Up @@ -223,7 +222,11 @@ open class Z3TranslatorVisitor(
return if (!useBitVecBasedTypeSystem || possibleConcreteTypes.size < maxTypeNumberForEnumeration) {
z3Context.mkOr(
*possibleBaseTypes
.map { z3Context.mkEq(z3Context.mkBV(typeRegistry.findTypeId(it), Int.SIZE_BITS), symType) }
.map {
val typeId = typeRegistry.findTypeId(it)
val typeIdBv = z3Context.mkBV(typeId, Int.SIZE_BITS)
z3Context.mkEq(typeIdBv, symType)
}
.toTypedArray()
)
} else {
Expand Down