Fix summary infoflow

Author: MarcMil

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/generator/SummaryInfoflow.java

@@ -2,6 +2,8 @@
 
 import java.util.Collection;
 
+import soot.Local;
+import soot.jimple.infoflow.FlowDroidLocalSplitter;
 import soot.jimple.infoflow.Infoflow;
 import soot.jimple.infoflow.InfoflowManager;
 import soot.jimple.infoflow.solver.IInfoflowSolver;
@@ -35,10 +37,28 @@ public InfoflowManager getManager() {
 
 	@Override
 	protected void onTaintPropagationCompleted(IInfoflowSolver forwardSolver, IInfoflowSolver aliasSolver,
-											   IInfoflowSolver backwardSolver, IInfoflowSolver backwardAliasSolver) {
+			IInfoflowSolver backwardSolver, IInfoflowSolver backwardAliasSolver) {
 		cachedManager = this.manager;
 	}
 
+	@Override
+	protected void unsplitAllBodies() {
+		//Since we are interested in abstractions, we must not unsplit.
+		//This is fine for our use case
+	}
+
+	@Override
+	protected FlowDroidLocalSplitter getLocalSplitter() {
+		return new FlowDroidLocalSplitter() {
+
+			@Override
+			protected Local createClonedLocal(Local oldLocal) {
+				//We want "normal" locals since we take deep looks into abstractions
+				return (Local) oldLocal.clone();
+			}
+		};
+	}
+
 	@Override
 	protected void initializeSoot(String appPath, String libPath, Collection<String> classes) {
 		this.libPath = libPath;

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

@@ -569,7 +569,11 @@ private void patchCode(Body body) {
 		if (config.isPatchInvokeDynamicInstructions()) {
 			patchDynamicInvokeInstructions(body);
 		}
-		FlowDroidLocalSplitter.v().transform(body);
+		getLocalSplitter().transform(body);
+	}
+
+	protected FlowDroidLocalSplitter getLocalSplitter() {
+		return FlowDroidLocalSplitter.v();
 	}
 
 	/**
@@ -956,7 +960,7 @@ protected void runAnalysis(final ISourceSinkManager sourcesSinks, final Set<Stri
 		}
 	}
 
-	private void unsplitAllBodies() {
+	protected void unsplitAllBodies() {
 		for (SootClass sc : Scene.v().getClasses()) {
 			for (SootMethod m : sc.getMethods()) {
 				if (m.hasActiveBody()) {
@@ -987,11 +991,12 @@ private void unsplitAllBodies() {
 	//can be a problem for FlowDroid. So, we split the locals prior to 
 	//running FlowDroid.
 	protected void splitAllBodies(Iterator<? extends MethodOrMethodContext> it) {
-		FlowDroidLocalSplitter splitter = FlowDroidLocalSplitter.v();
+		FlowDroidLocalSplitter splitter = getLocalSplitter();
 		while (it.hasNext()) {
 			MethodOrMethodContext mc = it.next();
 			SootMethod m = mc.method();
-			if (m.isConcrete()) {
+			if (m.isConcrete() && m.getTag(SplittedTag.NAME) == null) {
+				m.addTag(SplittedTag.v());
 				splitter.transform(m.retrieveActiveBody());
 			}
 		}

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

@@ -0,0 +1,19 @@
+package soot.jimple.infoflow;
+
+import soot.tagkit.Tag;
+
+public class SplittedTag implements Tag {
+
+	public static final String NAME = "Splitted";
+	private static final Tag INSTANCE = new SplittedTag();
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	public static Tag v() {
+		return INSTANCE;
+	}
+
+}