Fix JcApplicationGraph initialization

Remove Usages in JacoDBContainer. Use SyncUsagesExtension directly
UnitTestBot · Jul 18, 2024 · ad6301c · ad6301c
1 parent bea6a3a
commit ad6301c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/usvm-jvm/src/main/kotlin/org/usvm/machine/JcApplicationGraph.kt b/usvm-jvm/src/main/kotlin/org/usvm/machine/JcApplicationGraph.kt
@@ -6,7 +6,8 @@ import org.jacodb.api.jvm.JcMethod
 import org.jacodb.api.jvm.JcTypedMethod
 import org.jacodb.api.jvm.cfg.JcInst
 import org.jacodb.api.jvm.ext.toType
-import org.jacodb.impl.features.usagesExt
+import org.jacodb.impl.features.SyncUsagesExtension
+import org.jacodb.impl.features.hierarchyExt
 import org.usvm.dataflow.jvm.graph.JcApplicationGraphImpl
 import org.usvm.statistics.ApplicationGraph
 import org.usvm.util.originalInst
@@ -18,7 +19,8 @@ import java.util.concurrent.ConcurrentHashMap
 class JcApplicationGraph(
     cp: JcClasspath,
 ) : ApplicationGraph<JcMethod, JcInst> {
-    private val jcApplicationGraph = JcApplicationGraphImpl(cp, runBlocking { cp.usagesExt() })
+    private val jcApplicationGraph =
+        JcApplicationGraphImpl(cp, SyncUsagesExtension(runBlocking { cp.hierarchyExt() }, cp))
 
     override fun predecessors(node: JcInst): Sequence<JcInst> {
         return jcApplicationGraph.predecessors(node.originalInst())

diff --git a/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt b/usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt
@@ -57,7 +57,7 @@ class JacoDBContainer(
 
         private val defaultBuilder: JcSettings.() -> Unit = {
             useProcessJavaRuntime()
-            installFeatures(InMemoryHierarchy, Usages)
+            installFeatures(InMemoryHierarchy)
         }
     }
 }