Only synchronize necessary part

MarcMil · MarcMil · commit f30075678c5a · 2022-11-30T18:47:31.000+01:00
diff --git a/soot-infoflow/src/soot/jimple/infoflow/solver/cfg/InfoflowCFG.java b/soot-infoflow/src/soot/jimple/infoflow/solver/cfg/InfoflowCFG.java
@@ -383,8 +383,10 @@ else if (writes)
 		}
 
 		// Merge the temporary results into the global cache
-		for (Entry<SootMethod, StaticFieldUse> tempEntry : tempUses.entrySet()) {
-			registerStaticVariableUse(tempEntry.getKey(), variable, tempEntry.getValue());
+		synchronized (tempUses) {
+			for (Entry<SootMethod, StaticFieldUse> tempEntry : tempUses.entrySet()) {
+				registerStaticVariableUse(tempEntry.getKey(), variable, tempEntry.getValue());
+			}
 		}
 
 		StaticFieldUse outerUse = tempUses.get(smethod);

Original file line number	Diff line number	Diff line change
`@@ -383,8 +383,10 @@ else if (writes)`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`// Merge the temporary results into the global cache`
`386`		`- for (Entry<SootMethod, StaticFieldUse> tempEntry : tempUses.entrySet()) {`
`387`		`- registerStaticVariableUse(tempEntry.getKey(), variable, tempEntry.getValue());`
	`386`	`+ synchronized (tempUses) {`
	`387`	`+ for (Entry<SootMethod, StaticFieldUse> tempEntry : tempUses.entrySet()) {`
	`388`	`+ registerStaticVariableUse(tempEntry.getKey(), variable, tempEntry.getValue());`
	`389`	`+ }`
`388`	`390`	`}`
`389`	`391`
`390`	`392`	`StaticFieldUse outerUse = tempUses.get(smethod);`