Skip to content

Commit

Permalink
Merge pull request #296 from ftsrg/add-svcomp-flag
Browse files Browse the repository at this point in the history
added new flag --only-svcomp-witness
  • Loading branch information
leventeBajczi authored Aug 29, 2024
2 parents 289781e + 87e30af commit cb77d7e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {

allprojects {
group = "hu.bme.mit.theta"
version = "6.5.1"
version = "6.5.2"

apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private fun postVerificationLogging(
}

if (!config.outputConfig.witnessConfig.disable) {
if (safetyResult.isUnsafe && safetyResult.asUnsafe().cex != null) {
if (safetyResult.isUnsafe && safetyResult.asUnsafe().cex != null && !config.outputConfig.witnessConfig.svcomp) {
val concrTrace: Trace<XcfaState<ExplState>, XcfaAction> = XcfaTraceConcretizer.concretize(
safetyResult.asUnsafe().cex as Trace<XcfaState<PtrState<*>>, XcfaAction>?,
getSolver(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,12 @@ data class OutputConfig(
) : Config {

override fun getObjects(): Set<Config> {
return super.getObjects() union cOutputConfig.getObjects() union xcfaOutputConfig.getObjects() union witnessConfig.getObjects() union argConfig.getObjects()
return super.getObjects() union cOutputConfig.getObjects() union xcfaOutputConfig.getObjects() union chcOutputConfig.getObjects() union witnessConfig.getObjects() union argConfig.getObjects()
}

override fun update(): Boolean =
listOf(cOutputConfig, xcfaOutputConfig, witnessConfig, argConfig).map { it.update() }.any { it }
listOf(cOutputConfig, xcfaOutputConfig, chcOutputConfig, witnessConfig, argConfig).map { it.update() }
.any { it }
}

data class XcfaOutputConfig(
Expand Down Expand Up @@ -382,6 +383,9 @@ data class WitnessConfig(
@Parameter(names = ["--disable-witness-generation"])
var disable: Boolean = false,

@Parameter(names = ["--only-svcomp-witness"])
var svcomp: Boolean = false,

@Parameter(names = ["--cex-solver"], description = "Concretizer solver name")
var concretizerSolver: String = "Z3",

Expand Down

0 comments on commit cb77d7e

Please sign in to comment.