From 569d6ec03b66bf42c7219114ac49e4462cd6063e Mon Sep 17 00:00:00 2001 From: MchKosticyn Date: Sun, 27 Jul 2025 15:04:27 +0300 Subject: [PATCH] [chore] updated jacodb version --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- .../src/main/kotlin/org/usvm/util/JcApproximationUtils.kt | 4 +++- usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index ae17da9c71..0492a78a95 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -6,7 +6,7 @@ object Versions { const val clikt = "5.0.0" const val detekt = "1.23.7" const val ini4j = "0.5.4" - const val jacodb = "da338ffc83" + const val jacodb = "d7dd9d343b" const val juliet = "1.3.2" const val junit = "5.9.3" const val kotlin = "2.1.0" diff --git a/usvm-jvm/src/main/kotlin/org/usvm/util/JcApproximationUtils.kt b/usvm-jvm/src/main/kotlin/org/usvm/util/JcApproximationUtils.kt index 5facf55e68..360e5a30de 100644 --- a/usvm-jvm/src/main/kotlin/org/usvm/util/JcApproximationUtils.kt +++ b/usvm-jvm/src/main/kotlin/org/usvm/util/JcApproximationUtils.kt @@ -44,7 +44,9 @@ suspend fun JcDatabase.classpathWithApproximations( val approximationsPath = setOf(File(usvmApiJarPath), File(usvmApproximationsJarPath)) val cpWithApproximations = dirOrJars + approximationsPath - val featuresWithApproximations = features + listOf(Approximations) + val approximations = this.features.filterIsInstance().singleOrNull() + ?: error("approximations feature not found in database features") + val featuresWithApproximations = features + listOf(approximations) val cp = classpath(cpWithApproximations, featuresWithApproximations.distinct()) val approximationsLocations = cp.locations.filter { it.jarOrFolder in approximationsPath } diff --git a/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt b/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt index eba93fe4bb..cbf5da90c1 100644 --- a/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt +++ b/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt @@ -28,7 +28,7 @@ class JacoDBContainer( builder() if (samplesWithApproximationsKey == key) { - installFeatures(Approximations) + installFeatures(Approximations(emptyList())) } loadByteCode(classpath)