Merge pull request #817 from t1mlange/develop

StevenArzt · web-flow · commit 22274567e3b8 · 2025-05-14T12:18:38.000+02:00
Fix interproc constant folding with side-effects
diff --git a/soot-infoflow/src/soot/jimple/infoflow/codeOptimization/InterproceduralConstantValuePropagator.java b/soot-infoflow/src/soot/jimple/infoflow/codeOptimization/InterproceduralConstantValuePropagator.java
@@ -483,7 +483,6 @@ private void propagateReturnValueIntoCallers(SootMethod sm) {
 							ConstantPropagatorAndFolder.v().transform(caller.getActiveBody());
 							checkAndAddMethod(caller);
 						}
-						caller.getActiveBody().getUnits().remove(assignConst);
 
 						Stmt inv = Jimple.v().newInvokeStmt(assign.getInvokeExpr());
 						caller.getActiveBody().getUnits().swapWith(assign, inv);

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,6 @@ private void propagateReturnValueIntoCallers(SootMethod sm) {`
`483`	`483`	`ConstantPropagatorAndFolder.v().transform(caller.getActiveBody());`
`484`	`484`	`checkAndAddMethod(caller);`
`485`	`485`	`}`
`486`		`- caller.getActiveBody().getUnits().remove(assignConst);`
`487`	`486`
`488`	`487`	`Stmt inv = Jimple.v().newInvokeStmt(assign.getInvokeExpr());`
`489`	`488`	`caller.getActiveBody().getUnits().swapWith(assign, inv);`