make mutable cfg an actual control flow graph

com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java

@@ -1,8 +1,16 @@
 package com.ibm.wala.cfg.exc.intra;
 
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.IBasicBlock;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.util.graph.impl.SparseNumberedGraph;
+import com.ibm.wala.util.intset.BitVector;
+import com.ibm.wala.util.intset.IntSet;
 
 /**
  * A modifiable control flow graph.
@@ -10,13 +18,16 @@ import com.ibm.wala.util.graph.impl.SparseNumberedGraph;
  * @author Juergen Graf <graf@kit.edu>
  *
  */
-public class MutableCFG<X, T extends IBasicBlock<X>> extends SparseNumberedGraph<T> {
+public class MutableCFG<X, T extends IBasicBlock<X>> extends SparseNumberedGraph<T> implements ControlFlowGraph<X, T> {
 
-  private MutableCFG() {
+  private final ControlFlowGraph<X, T> orig;
+  
+  private MutableCFG(final ControlFlowGraph<X, T> orig) {
+    this.orig = orig;
   }
   
   public static <I, T extends IBasicBlock<I>> MutableCFG<I, T> copyFrom(ControlFlowGraph<I, T> cfg) {
-    MutableCFG<I, T> mutable = new MutableCFG<I, T>();
+    MutableCFG<I, T> mutable = new MutableCFG<I, T>(cfg);
     
     for (T node : cfg) {
       mutable.addNode(node);
@@ -34,5 +45,103 @@ public class MutableCFG<X, T extends IBasicBlock<X>> extends SparseNumberedGraph
     
     return mutable;
   }
+
+  public T entry() {
+    return orig.entry();
+  }
+
+  public T exit() {
+    return orig.exit();
+  }
+
+  // slow
+  public BitVector getCatchBlocks() {
+    final BitVector bvOrig = orig.getCatchBlocks();
+    final BitVector bvThis = new BitVector();
+    
+    for (final T block : this) {
+      bvThis.set(block.getNumber());
+    }
+    
+    bvThis.and(bvOrig);
+    
+    return bvThis;
+  }
+
+  public T getBlockForInstruction(int index) {
+    final T block =  orig.getBlockForInstruction(index);
+    
+    return (containsNode(block) ? block : null);
+  }
+
+  public X[] getInstructions() {
+    return orig.getInstructions();
+  }
+
+  public int getProgramCounter(int index) {
+    return orig.getProgramCounter(index);
+  }
+
+  public IMethod getMethod() {
+    return orig.getMethod();
+  }
+
+  public List<T> getExceptionalSuccessors(T b) {
+    final List<T> origSucc = orig.getExceptionalSuccessors(b);
+    final IntSet allSuccs = this.getSuccNodeNumbers(b);
+    final List<T> thisSuccs = new LinkedList<T>();
+    
+    for (final T block : origSucc) {
+      if (allSuccs.contains(block.getNumber())) {
+        thisSuccs.add(block);
+      }
+    }
+    
+    return thisSuccs;
+  }
+
+  public Collection<T> getNormalSuccessors(T b) {
+    final List<T> excSuccs = getExceptionalSuccessors(b);
+    final List<T> thisSuccs = new LinkedList<T>();
+    
+    final Iterator<T> succs = getSuccNodes(b);
+    while (succs.hasNext()) {
+      final T succ = succs.next();
+      if (!excSuccs.contains(succ)) {
+        thisSuccs.add(succ);
+      }
+    }
+    
+    return thisSuccs;
+  }
+
+  public Collection<T> getExceptionalPredecessors(T b) {
+    final Collection<T> origPreds = orig.getExceptionalPredecessors(b);
+    final IntSet allPreds = this.getPredNodeNumbers(b);
+    final List<T> thisPreds = new LinkedList<T>();
+    
+    for (final T block : origPreds) {
+      if (allPreds.contains(block.getNumber())) {
+        thisPreds.add(block);
+      }
+    }
+    
+    return thisPreds;
+  }
+
+  public Collection<T> getNormalPredecessors(T b) {
+    final Collection<T> excPreds = getExceptionalPredecessors(b);
+    final List<T> thisPreds = new LinkedList<T>();
+    
+    final Iterator<T> preds = getPredNodes(b);
+    while (preds.hasNext()) {
+      final T pred = preds.next();
+      if (!excPreds.contains(pred)) {
+        thisPreds.add(pred);
+      }
+    }
+    
+    return thisPreds;
+  }
   
 }