Store successors in List to retain the original order

UnitTestBot · Jun 20, 2024 · 6fb0240 · 6fb0240
1 parent 01e5e6f
commit 6fb0240
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/convert.kt b/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/convert.kt
@@ -450,16 +450,16 @@ fun cfg2cfg(cfg: CfgDto, arkMethod: ArkMethod): ArkCfg {
             }
         }
     }
-    val successorMap: MutableMap<ArkStmt, Set<ArkStmt>> = hashMapOf()
+    val successorMap: MutableMap<ArkStmt, List<ArkStmt>> = hashMapOf()
     for (block in cfg.blocks) {
         for (i in block.stmts.indices) {
             val arkStmt = stmts[blockStart[block.id]!! + i]
             if (i == block.stmts.lastIndex) {
-                successorMap[arkStmt] = block.successors.mapNotNullTo(hashSetOf()) { id ->
+                successorMap[arkStmt] = block.successors.mapNotNull { id ->
                     blockStart[id]?.let { stmts[it] }
                 }
             } else {
-                successorMap[arkStmt] = setOf(stmts[i + 1])
+                successorMap[arkStmt] = listOf(stmts[i + 1])
             }
         }
     }

diff --git a/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/graph/ArkCfg.kt b/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/graph/ArkCfg.kt
@@ -22,7 +22,7 @@ import org.jacodb.panda.dynamic.ark.base.ArkTerminatingStmt
 
 class ArkCfg(
     val stmts: List<ArkStmt>,
-    private val successorMap: Map<ArkStmt, Set<ArkStmt>>,
+    private val successorMap: Map<ArkStmt, List<ArkStmt>>,
 ) : ControlFlowGraph<ArkStmt> {
 
     private val predecessorMap: Map<ArkStmt, Set<ArkStmt>> by lazy {
@@ -45,7 +45,7 @@ class ArkCfg(
         get() = instructions.filterIsInstance<ArkTerminatingStmt>()
 
     override fun successors(node: ArkStmt): Set<ArkStmt> {
-        return successorMap[node]!!
+        return successorMap[node]!!.toSet()
     }
 
     override fun predecessors(node: ArkStmt): Set<ArkStmt> {