Merge branch 'fix-flowdroid-bug' of github.com:MarcMil/FlowDroid into fix-flowdroid-bug

Author: MarcMil

soot-infoflow/src/soot/jimple/infoflow/FlowDroidLocalSplitter.java

@@ -1,14 +1,19 @@
 package soot.jimple.infoflow;
 
+import java.util.Map;
+
+import soot.Body;
 import soot.Local;
 import soot.Singletons.Global;
 import soot.jimple.internal.JimpleLocal;
 import soot.toolkits.scalar.LocalSplitter;
+import soot.toolkits.scalar.UnusedLocalEliminator;
 
 /**
- * With more recent soot versions, locals are reused more often.
- * This can cause problems in FlowDroid (e.g. the overwriteParameter test case).
- * The simple solution: We split these locals beforehand
+ * With more recent soot versions, locals are reused more often. This can cause
+ * problems in FlowDroid (e.g. the overwriteParameter test case). The simple
+ * solution: We split these locals beforehand
+ * 
  * @author Marc Miltenberger
  */
 public class FlowDroidLocalSplitter extends LocalSplitter {
@@ -19,7 +24,7 @@ public static class SplittedLocal extends JimpleLocal {
 
 		public SplittedLocal(JimpleLocal oldLocal) {
 			super(null, oldLocal.getType());
-			//do not intern the name again
+			// do not intern the name again
 			setName(oldLocal.getName());
 			if (oldLocal.isUserDefinedLocal()) {
 				setUserDefinedLocal();
@@ -43,7 +48,7 @@ public FlowDroidLocalSplitter() {
 
 	@Override
 	protected String getNewName(String name, int count) {
-		//Reuse the old name
+		// Reuse the old name
 		return name;
 	}
 
@@ -56,4 +61,10 @@ public static FlowDroidLocalSplitter v() {
 		return new FlowDroidLocalSplitter();
 	}
 
+	@Override
+	protected void internalTransform(Body body, String phaseName, Map<String, String> options) {
+		super.internalTransform(body, phaseName, options);
+		UnusedLocalEliminator.v().transform(body);
+	}
+
 }