Handle specialinvokes in OnFlyCallgraphBuilder better

src/main/java/soot/dotnet/members/ByReferenceWrapperGenerator.java

@@ -50,6 +50,7 @@
  * @author Marc Miltenberger
  */
 public class ByReferenceWrapperGenerator {
+  public static final String WRAPPER_FIELD_NAME = "r";
   public static final String WRAPPER_CLASS_NAME = "ByReferenceWrappers.Wrapper";
 
   public synchronized static SootClass getWrapperClass(Type t) {
@@ -61,7 +62,7 @@ public synchronized static SootClass getWrapperClass(Type t) {
     }
     SootClass sc = scene.makeSootClass(name, Modifier.FINAL | Modifier.STATIC);
     sc.setApplicationClass();
-    SootField r = scene.makeSootField("r", RefType.v("System.Object"));
+    SootField r = scene.makeSootField(WRAPPER_FIELD_NAME, RefType.v("System.Object"));
     r.setModifiers(Modifier.PUBLIC);
     sc.addField(r);
 
@@ -120,7 +121,7 @@ public static Unit getUnwrapCall(SootClass wrapperClass, Value argToUnwrap, Valu
   }
 
   public static SootField getWrapperField(SootClass wrapperClass) {
-    return wrapperClass.getFieldByName("r");
+    return wrapperClass.getFieldByName(WRAPPER_FIELD_NAME);
   }
 
   /**
@@ -134,7 +135,7 @@ public static SootField getWrapperField(SootClass wrapperClass) {
    */
   public static Unit getUpdateWrappedValueCall(Local wrapped, Local unwrapped) {
     RefType rt = (RefType) wrapped.getType();
-    SootField f = rt.getSootClass().getFieldByName("r");
+    SootField f = rt.getSootClass().getFieldByName(WRAPPER_FIELD_NAME);
     Jimple j = Jimple.v();
     return j.newAssignStmt(j.newInstanceFieldRef(wrapped, f.makeRef()), unwrapped);
 

src/main/java/soot/jimple/spark/solver/PropWorklist.java

@@ -56,7 +56,7 @@
 
 public class PropWorklist extends Propagator {
   private static final Logger logger = LoggerFactory.getLogger(PropWorklist.class);
-  protected final Set<VarNode> varNodeWorkList = new TreeSet<VarNode>();
+  protected final TreeSet<VarNode> varNodeWorkList = new TreeSet<VarNode>();
 
   public PropWorklist(PAG pag) {
     this.pag = pag;
@@ -75,10 +75,9 @@ public void propagate() {
       if (verbose) {
         logger.debug("Worklist has " + varNodeWorkList.size() + " nodes.");
       }
-      while (!varNodeWorkList.isEmpty()) {
-        VarNode src = varNodeWorkList.iterator().next();
-        varNodeWorkList.remove(src);
-        handleVarNode(src);
+      VarNode vsrc;
+      while ((vsrc = varNodeWorkList.pollFirst()) != null) {
+        handleVarNode(vsrc);
       }
       if (verbose) {
         logger.debug("Now handling field references");

src/main/java/soot/jimple/toolkits/callgraph/OnFlyCallGraphBuilder.java

@@ -1,7 +1,5 @@
 package soot.jimple.toolkits.callgraph;
 
-import java.lang.reflect.Constructor;
-
 /*-
  * #%L
  * Soot - a J*va Optimization Framework
@@ -96,7 +94,6 @@
 import soot.jimple.StringConstant;
 import soot.jimple.VirtualInvokeExpr;
 import soot.jimple.spark.pag.AllocDotField;
-import soot.jimple.spark.pag.PAG;
 import soot.jimple.toolkits.annotation.nullcheck.NullnessAnalysis;
 import soot.jimple.toolkits.callgraph.ConstantArrayAnalysis.ArrayTypes;
 import soot.jimple.toolkits.callgraph.VirtualEdgesSummaries.DeferredVirtualEdgeTarget;
@@ -810,17 +807,21 @@ protected void findReceivers(SootMethod m, Body b) {
         if (ie instanceof InstanceInvokeExpr) {
           InstanceInvokeExpr iie = (InstanceInvokeExpr) ie;
           Local receiver = (Local) iie.getBase();
-          MethodSubSignature subSig = new MethodSubSignature(iie.getMethodRef());
-
-          VirtualEdge virtualEdge = virtualEdgeSummaries.getVirtualEdgesMatchingSubSig(subSig);
-          if (virtualEdge != null) {
-            for (VirtualEdgeTarget t : virtualEdge.targets) {
-              if (t instanceof InvocationVirtualEdgeTarget) {
-                processVirtualEdgeSummary(m, s, receiver, (InvocationVirtualEdgeTarget) t, virtualEdge.edgeType);
-              } else if (t instanceof DeferredVirtualEdgeTarget) {
-                addVirtualCallSite(s, m, receiver, iie, new MethodSubSignature(iie.getMethodRef()), Kind.GENERIC_FAKE);
+          if (!(iie instanceof SpecialInvokeExpr)) {
+            MethodSubSignature subSig = new MethodSubSignature(iie.getMethodRef());
+
+            VirtualEdge virtualEdge = virtualEdgeSummaries.getVirtualEdgesMatchingSubSig(subSig);
+            if (virtualEdge != null) {
+              for (VirtualEdgeTarget t : virtualEdge.targets) {
+                if (t instanceof InvocationVirtualEdgeTarget) {
+                  processVirtualEdgeSummary(m, s, receiver, (InvocationVirtualEdgeTarget) t, virtualEdge.edgeType);
+                } else if (t instanceof DeferredVirtualEdgeTarget) {
+                  addVirtualCallSite(s, m, receiver, iie, new MethodSubSignature(iie.getMethodRef()), Kind.GENERIC_FAKE);
+                }
               }
             }
+          } else {
+            addEdge(m, s, ie.getMethod(), Kind.SPECIAL);
           }
 
           // if (!hasVirtualEdge || !iie.getMethod().isPhantom())
@@ -970,7 +971,7 @@ private void getImplicitTargets(SootMethod source) {
     if (!source.isConcrete()) {
       return;
     }
-    if (source.getSubSignature().contains("<init>")) {
+    if (source.isConstructor()) {
       handleInit(source, scl);
     }
     for (Unit u : source.retrieveActiveBody().getUnits()) {

src/main/java/soot/jimple/toolkits/callgraph/ReachableMethods.java

@@ -25,7 +25,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.NoSuchElementException;
 import java.util.Set;
 
 import soot.MethodOrMethodContext;
@@ -91,13 +90,15 @@ public void update() {
     while (unprocessedMethods.hasNext()) {
       MethodOrMethodContext m = unprocessedMethods.next();
       if (m == null) {
-    	continue;
+        continue;
       }
       Iterator<Edge> targets = cg.edgesOutOf(m);
       if (filter != null) {
         targets = filter.wrap(targets);
       }
-      addMethods(new Targets(targets));
+      if (targets.hasNext()) {
+        addMethods(new Targets(targets));
+      }
     }
   }