Use concurrent multi hashmap

Author: MarcMil

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/AbstractCallbackAnalyzer.java

@@ -76,6 +76,7 @@
 import soot.toolkits.graph.ExceptionalUnitGraph;
 import soot.toolkits.graph.ExceptionalUnitGraphFactory;
 import soot.toolkits.scalar.SimpleLocalDefs;
+import soot.util.ConcurrentHashMultiMap;
 import soot.util.HashMultiMap;
 import soot.util.MultiMap;
 
@@ -129,8 +130,8 @@ public abstract class AbstractCallbackAnalyzer {
 	protected final MultiMap<SootClass, AndroidCallbackDefinition> callbackMethods = new HashMultiMap<>();
 	protected final MultiMap<SootClass, Integer> layoutClasses = new HashMultiMap<>();
 	protected final Set<SootClass> dynamicManifestComponents = Collections.newSetFromMap(new ConcurrentHashMap<>());
-	protected final MultiMap<SootClass, SootClass> fragmentClasses = new HashMultiMap<>();
-	protected final MultiMap<SootClass, SootClass> fragmentClassesRev = new HashMultiMap<>();
+	protected final MultiMap<SootClass, SootClass> fragmentClasses = new ConcurrentHashMultiMap<>();
+	protected final MultiMap<SootClass, SootClass> fragmentClassesRev = new ConcurrentHashMultiMap<>();
 	protected final Map<SootClass, Integer> fragmentIDs = new ConcurrentHashMap<>();
 
 	protected final List<ICallbackFilter> callbackFilters = new ArrayList<>();
@@ -201,7 +202,7 @@ else if (arrayLocals.contains(lop))
 
 			});
 
-	private MultiMap<SootMethod, Stmt> javaScriptInterfaces = new HashMultiMap<SootMethod, Stmt>();
+	private MultiMap<SootMethod, Stmt> javaScriptInterfaces = new ConcurrentHashMultiMap<SootMethod, Stmt>();
 
 	public AbstractCallbackAnalyzer(InfoflowAndroidConfiguration config, Set<SootClass> entryPointClasses)
 			throws IOException {
@@ -454,9 +455,7 @@ protected void analyzeMethodForJavascriptInterfaces(SootMethod method) {
 				final SootMethodRef methodRef = iexpr.getMethodRef();
 				if (methodRef.getName().equals("addJavascriptInterface") && iexpr.getArgCount() == 2
 						&& fastHierarchy.canStoreType(methodRef.getDeclaringClass().getType(), webViewType)) {
-					synchronized (javaScriptInterfaces) {
-						this.javaScriptInterfaces.put(method, stmt);
-					}
+					this.javaScriptInterfaces.put(method, stmt);
 				}
 			}
 		}
@@ -993,10 +992,8 @@ && isEmpty(method.retrieveActiveBody()))
 		if (!filterAccepts(lifecycleClass, method))
 			return false;
 
-		synchronized (this.callbackMethods) {
-			return this.callbackMethods.put(lifecycleClass,
-					new AndroidCallbackDefinition(method, parentMethod, callbackType));
-		}
+		return this.callbackMethods.put(lifecycleClass,
+				new AndroidCallbackDefinition(method, parentMethod, callbackType));
 	}
 
 	/**
@@ -1006,7 +1003,7 @@ && isEmpty(method.retrieveActiveBody()))
 	 *                       fragment belongs
 	 * @param fragmentClass  The fragment class
 	 */
-	protected synchronized void checkAndAddFragment(SootClass componentClass, SootClass fragmentClass) {
+	protected void checkAndAddFragment(SootClass componentClass, SootClass fragmentClass) {
 		this.fragmentClasses.put(componentClass, fragmentClass);
 		this.fragmentClassesRev.put(fragmentClass, componentClass);
 	}

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/DefaultCallbackAnalyzer.java

@@ -90,6 +90,7 @@ protected void internalTransform(String phaseName, @SuppressWarnings("rawtypes")
 
 				// Do we have to start from scratch or do we have a worklist to
 				// process?
+
 				if (callbackWorklist == null) {
 					logger.info("Collecting callbacks in DEFAULT mode...");
 					callbackWorklist = new HashMultiMap<>();
@@ -298,12 +299,13 @@ protected void checkAndAddFragment(SootClass componentClass, SootClass fragmentC
 	private void findClassLayoutMappings() {
 		if (rmIterator == null)
 			rmIterator = Scene.v().getReachableMethods().listener();
+		final SystemClassHandler handler = SystemClassHandler.v();
 		while (rmIterator.hasNext()) {
 			SootMethod sm = rmIterator.next().method();
 
 			if (!sm.isConcrete())
 				continue;
-			if (SystemClassHandler.v().isClassInSystemPackage(sm.getDeclaringClass()))
+			if (handler.isClassInSystemPackage(sm.getDeclaringClass()))
 				continue;
 			for (Unit u : sm.retrieveActiveBody().getUnits()) {
 				if (u instanceof Stmt) {