Proper support for merging isExclusive

Author: MarcMil

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/data/provider/MergingSummaryProvider.java

@@ -52,8 +52,9 @@ public ClassMethodSummaries getMethodFlows(String className, String methodSignat
 		for (IMethodSummaryProvider provider : innerProviders) {
 			ClassMethodSummaries providerSummaries = provider.getMethodFlows(className, methodSignature);
 			if (providerSummaries != null) {
-				if (summaries == null)
-					summaries = new ClassMethodSummaries(className);
+				if (summaries == null) {
+					summaries = new ClassMethodSummaries(providerSummaries);
+				}
 				summaries.merge(providerSummaries);
 			}
 		}
@@ -80,8 +81,9 @@ public ClassMethodSummaries getClassFlows(String clazz) {
 		for (IMethodSummaryProvider provider : innerProviders) {
 			ClassMethodSummaries providerSummaries = provider.getClassFlows(clazz);
 			if (providerSummaries != null) {
-				if (summaries == null)
-					summaries = new ClassMethodSummaries(clazz);
+				if (summaries == null) {
+					summaries = new ClassMethodSummaries(providerSummaries);
+				}
 				summaries.merge(providerSummaries);
 			}
 		}

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/data/summary/ClassMethodSummaries.java

@@ -19,6 +19,19 @@ public class ClassMethodSummaries {
 
 	private boolean isExclusiveForClass = true;
 
+	/**
+	 * Creates a shallow copy from an existing class method summary instance.
+	 * @param from the source from which to copy
+	 */
+	public ClassMethodSummaries(ClassMethodSummaries from) {
+		this.className = from.className;
+		//shallow copy
+		this.methodSummaries = from.methodSummaries;
+		this.isInterface = from.isInterface;
+		this.interfaces.addAll(from.interfaces);
+		this.superClass = from.superClass;
+	}
+
 	public ClassMethodSummaries(String className) {
 		this.className = className;
 		this.methodSummaries = new MethodSummaries();
@@ -126,6 +139,9 @@ public boolean merge(ClassMethodSummaries methodFlows) {
 		if (isInterface == null && methodFlows.isInterface != null)
 			this.isInterface = methodFlows.isInterface;
 
+		if (methodFlows.isExclusiveForClass())
+			setExclusiveForClass(true);
+
 		return hasNewData;
 	}