Merge pull request #2146 from MarcMil/tidyup

Remove getParameterRefs()

Author: StevenArzt

src/main/java/soot/Body.java

@@ -444,37 +444,6 @@ public List<Local> getParameterLocals() {
     return Arrays.asList(res);
   }
 
-  /**
-   * Returns the list of parameter references used in this body. The list is as long as the number of parameters declared in
-   * the associated method's signature. The list may have <code>null</code> entries for parameters not referenced in the
-   * body. The returned list is of fixed size.
-   *
-   * @return
-   */
-  public List<Value> getParameterRefs() {
-    final int numParams = getMethod().getParameterCount();
-    Value[] res = new Value[numParams];
-    int numFound = 0;
-    for (Unit u : getUnits()) {
-      if (u instanceof IdentityStmt) {
-        Value rightOp = ((IdentityStmt) u).getRightOp();
-        if (rightOp instanceof ParameterRef) {
-          ParameterRef pr = (ParameterRef) rightOp;
-          int idx = pr.getIndex();
-          if (res[idx] != null) {
-            throw new RuntimeException("duplicate parameterref" + idx + " in " + getMethod());
-          }
-          res[idx] = pr;
-          numFound++;
-          if (numFound >= numParams) {
-            break;
-          }
-        }
-      }
-    }
-    return Arrays.asList(res);
-  }
-
   /**
    * Returns the Chain of Units that make up this body. The units are returned as a PatchingChain. The client can then
    * manipulate the chain, adding and removing units, and the changes will be reflected in the body. Since a PatchingChain is

src/main/java/soot/jimple/toolkits/ide/icfg/AbstractJimpleBasedICFG.java

@@ -42,7 +42,6 @@
 import soot.SootMethod;
 import soot.Unit;
 import soot.UnitBox;
-import soot.Value;
 import soot.jimple.Stmt;
 import soot.toolkits.graph.BriefUnitGraph;
 import soot.toolkits.graph.DirectedGraph;
@@ -64,15 +63,6 @@ public DirectedGraph<Unit> load(Body body) throws Exception {
         }
       });
 
-  @SynchronizedBy("by use of synchronized LoadingCache class")
-  protected LoadingCache<SootMethod, List<Value>> methodToParameterRefs
-      = IDESolver.DEFAULT_CACHE_BUILDER.build(new CacheLoader<SootMethod, List<Value>>() {
-        @Override
-        public List<Value> load(SootMethod m) throws Exception {
-          return m.getActiveBody().getParameterRefs();
-        }
-      });
-
   @SynchronizedBy("by use of synchronized LoadingCache class")
   protected LoadingCache<SootMethod, Set<Unit>> methodToCallsFromWithin
       = IDESolver.DEFAULT_CACHE_BUILDER.build(new CacheLoader<SootMethod, Set<Unit>>() {
@@ -185,11 +175,6 @@ public boolean isBranchTarget(Unit u, Unit succ) {
     return false;
   }
 
-  @Override
-  public List<Value> getParameterRefs(SootMethod m) {
-    return methodToParameterRefs.getUnchecked(m);
-  }
-
   @Override
   public Collection<Unit> getStartPointsOf(SootMethod m) {
     if (m.hasActiveBody()) {

src/main/java/soot/jimple/toolkits/ide/icfg/BackwardsInterproceduralCFG.java

@@ -28,7 +28,6 @@
 
 import soot.SootMethod;
 import soot.Unit;
-import soot.Value;
 import soot.toolkits.graph.DirectedGraph;
 
 /**
@@ -139,12 +138,6 @@ public DirectedGraph<Unit> getOrCreateUnitGraph(SootMethod m) {
     return delegate.getOrCreateUnitGraph(m);
   }
 
-  // same
-  @Override
-  public List<Value> getParameterRefs(SootMethod m) {
-    return delegate.getParameterRefs(m);
-  }
-
   @Override
   public boolean isFallThroughSuccessor(Unit stmt, Unit succ) {
     throw new UnsupportedOperationException("not implemented because semantics unclear");

src/main/java/soot/jimple/toolkits/ide/icfg/BiDiInterproceduralCFG.java

@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Set;
 
-import soot.Value;
 import soot.toolkits.graph.DirectedGraph;
 
 /**
@@ -47,8 +46,6 @@ public interface BiDiInterproceduralCFG<N, M> extends InterproceduralCFG<N, M> {
   // also exposed to some clients who need it
   public DirectedGraph<N> getOrCreateUnitGraph(M body);
 
-  public List<Value> getParameterRefs(M m);
-
   /**
    * Gets whether the given statement is a return site of at least one call
    *