Fix a bug where due to an optimization the computed path would be incorrect

Author: MarcMil

soot-infoflow/src/soot/jimple/infoflow/data/Abstraction.java

@@ -168,12 +168,11 @@ public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt) {
 		return deriveNewAbstraction(p, currentStmt, isImplicit);
 	}
 
-	public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
-		// If the new abstraction looks exactly like the current one, there is
-		// no need to create a new object
-		if (this.accessPath.equals(p) && this.currentStmt == currentStmt && this.isImplicit == isImplicit)
-			return this;
+	public Abstraction deriveDefinitelyNewAbstraction(AccessPath p, Stmt currentStmt) {
+		return deriveDefinitelyNewAbstraction(p, currentStmt, isImplicit);
+	}
 
+	public Abstraction deriveDefinitelyNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
 		Abstraction abs = deriveNewAbstractionMutable(p, currentStmt);
 		if (abs == null)
 			return null;
@@ -182,6 +181,15 @@ public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean
 		return abs;
 	}
 
+	public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
+		// If the new abstraction looks exactly like the current one, there is
+		// no need to create a new object
+		if (this.accessPath.equals(p) && this.currentStmt == currentStmt && this.isImplicit == isImplicit)
+			return this;
+
+		return deriveDefinitelyNewAbstraction(p, currentStmt, isImplicit);
+	}
+
 	protected Abstraction deriveNewAbstractionMutable(AccessPath p, Stmt currentStmt) {
 		// An abstraction needs an access path
 		if (p == null)

soot-infoflow/src/soot/jimple/infoflow/problems/TaintPropagationResults.java

@@ -63,7 +63,7 @@ public boolean addResult(AbstractionAtSink resultAbs) {
 
 		// Construct the abstraction at the sink
 		Abstraction abs = resultAbs.getAbstraction();
-		abs = abs.deriveNewAbstraction(abs.getAccessPath(), resultAbs.getSinkStmt());
+		abs = abs.deriveDefinitelyNewAbstraction(abs.getAccessPath(), resultAbs.getSinkStmt());
 		abs.setCorrespondingCallSite(resultAbs.getSinkStmt());
 
 		// Reduce the incoming abstraction