fix exception flow control - update trap comparison

soot-oss · Feb 6, 2025 · 53bf37e · 53bf37e
1 parent 72c3fde
commit 53bf37e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java
@@ -325,8 +325,12 @@ public void initializeWith(
   }
 
   private static int getTrapApplicationComparator(
-      HashMap<Stmt, Integer> trapstmtToIdx, Trap trapA, Trap trapB) {
-    if (trapA.getEndStmt() == trapB.getEndStmt()) {
+          HashMap<Stmt, Integer> trapstmtToIdx, Trap trapA, Trap trapB) {
+    if (trapA.getEndStmt() == trapB.getEndStmt() && trapA.getBeginStmt() == trapB.getBeginStmt()) {
+      final Integer idxA = trapstmtToIdx.get(trapA.getHandlerStmt());
+      final Integer idxB = trapstmtToIdx.get(trapB.getHandlerStmt());
+      return idxA - idxB;
+    } else if (trapA.getEndStmt() == trapB.getEndStmt()) {
       final Integer startIdxA = trapstmtToIdx.get(trapA.getBeginStmt());
       final Integer startIdxB = trapstmtToIdx.get(trapB.getBeginStmt());
       return startIdxB - startIdxA;