Merge pull request #2052 from MarcMil/tableext

Add helper method to switch statements, which shows the target

Author: StevenArzt

src/main/java/soot/jimple/SwitchStmt.java

@@ -43,6 +43,14 @@ public interface SwitchStmt extends Stmt {
   public ValueBox getKeyBox();
 
   public List<Unit> getTargets();
+  
+  /**
+   * Returns the target unit if a value with value
+   * "value" is the key
+   * @param value the value
+   * @return the target
+   */
+  public Unit getTargetForValue(int value);
 
   public Unit getTarget(int index);
 

src/main/java/soot/jimple/internal/JLookupSwitchStmt.java

@@ -164,4 +164,14 @@ public void convertToBaf(JimpleToBafContext context, List<Unit> out) {
     u.addAllTagsOf(this);
     out.add(u);
   }
+
+  @Override
+  public Unit getTargetForValue(int value) {
+    for (int i = 0; i < lookupValues.size(); i++) {
+      if (lookupValues.get(i).value == value) {
+        return getTarget(i);
+      }
+    }
+    return getDefaultTarget();
+  }
 }

src/main/java/soot/jimple/internal/JTableSwitchStmt.java

@@ -173,4 +173,23 @@ public void convertToBaf(JimpleToBafContext context, List<Unit> out) {
     u.addAllTagsOf(this);
     out.add(u);
   }
+
+  @Override
+  public Unit getTargetForValue(int value) {
+
+    final int high = highIndex;
+    int tgtIdx = 0;
+    // In this for-loop, we cannot use "<=" since 'i' would wrap around.
+    // The case for "i == highIndex" is handled separately after the loop.
+    for (int i = lowIndex; i < high; i++) {
+      if (value == i) {
+        return getTarget(tgtIdx);
+      }
+      tgtIdx++;
+    }
+    if (high == value) {
+      return getTarget(tgtIdx);
+    }
+    return getDefaultTarget();
+  }
 }