Merge pull request #2040 from MarcMil/nop-fix

Remove cg edges of deleted unreachable units

Author: StevenArzt

src/main/java/soot/jimple/toolkits/scalar/UnreachableCodeEliminator.java

@@ -117,11 +117,16 @@ protected void internalTransform(Body body, String phaseName, Map<String, String
     }
 
     Set<Unit> notReachable = null;
-    if (verbose) {
-      notReachable = new HashSet<Unit>();
-      for (Unit u : units) {
-        if (!reachable.contains(u)) {
+    for (Unit u : units) {
+      if (!reachable.contains(u)) {
+    	if (verbose) {
+    	  if (notReachable == null) {
+    	    notReachable = new HashSet<Unit>();
+    	  }
           notReachable.add(u);
+    	}
+        if (Scene.v().hasCallGraph()) {
+          Scene.v().getCallGraph().removeAllEdgesOutOf(u);
         }
       }
     }