Merge branch 'master' of https://github.com/wala/WALA

com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java

@@ -154,7 +154,17 @@ public abstract class IR implements IRView {
       int end = bb.getLastInstructionIndex();
       result.append("BB").append(bb.getNumber());
       if (bb instanceof ExceptionHandlerBasicBlock) {
-        result.append("<Handler>");
+
+        result.append("<Handler> (");
+        Iterator<TypeReference> catchIter = ((ExceptionHandlerBasicBlock) bb).getCaughtExceptionTypes();
+        while (catchIter.hasNext()) {
+          TypeReference next = catchIter.next();
+          result.append(next);
+          if (catchIter.hasNext()) {
+            result.append(",");
+          }
+        }
+        result.append(")");
       }
       result.append("\n");
       for (Iterator it = bb.iteratePhis(); it.hasNext();) {

com.ibm.wala.util/src/com/ibm/wala/util/collections/IntStack.java

@@ -59,4 +59,21 @@ public class IntStack {
       return top == -1;
   }
 
+  /**
+   * @return the number of elements in the stack.
+   */
+  public int size() {
+    return top + 1;
+  }
+
+  /**
+   * @return the ith int from the bottom of the stack
+   */
+  public int get(int i) {
+    if (i < 0 || i > top) {
+      throw new IndexOutOfBoundsException();
+    }
+    return state[i];
+  }
+
 }