ensure that instruction graph is always connected

vorpal-research · Jan 9, 2024 · 4b5b199 · 4b5b199
1 parent 8b1ea08
commit 4b5b199
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...rc/main/kotlin/org/vorpal/research/kex/asm/analysis/concolic/coverage/InstructionGraph.kt b/...rc/main/kotlin/org/vorpal/research/kex/asm/analysis/concolic/coverage/InstructionGraph.kt
@@ -179,16 +179,18 @@ class InstructionGraph(
                                 }
                             }.filter { it.hasBody }
                         }
+                        var connectedExits = false
                         for (candidate in resolvedMethods) {
                             queue += Triple(vertex, candidate.body.entry, 0)
                             queue.addAll(candidate.body.catchEntries.map { Triple(null, it, 0) })
 
                             candidate.body.flatten().filterIsInstance<ReturnInst>().forEach {
+                                connectedExits = true
                                 val returnVertex = nodes.getOrPut(it) { Vertex(it) }
                                 queue += Triple(returnVertex, block, index + 1)
                             }
                         }
-                        if (resolvedMethods.isEmpty()) {
+                        if (!connectedExits) {
                             queue += Triple(vertex, block, index + 1)
                         }
                     }